Merge pull request #1041 from untergeek/release/5.2.0.rc2

Tiny fixes for RC2

curator/_version.py

@@ -1,2 +1,2 @@
-__version__ = '5.2.0.rc1'
+__version__ = '5.2.0.rc2'
 

curator/actions.py

@@ -2030,6 +2030,8 @@ def do_dry_run(self):
         """
         Show what a regular run would do, but don't actually do it.
         """
+        self.index_list.filter_closed()
+        self.index_list.empty_list_check()
         try:
             index_lists = chunk_index_list(self.index_list.indices)
             for l in index_lists:
@@ -2046,6 +2048,8 @@ def do_dry_run(self):
             report_failure(e)
 
     def do_action(self):
+        self.index_list.filter_closed()
+        self.index_list.empty_list_check()
         try:
             index_lists = chunk_index_list(self.index_list.indices)
             for l in index_lists:
@@ -2071,6 +2075,7 @@ def do_action(self):
                     if self.wfc:
                         self.loggit.debug('Wait for shards to complete allocation for index: {0}'.format(target))
                         wait_for_it(self.client, 'shrink', wait_interval=self.wait_interval, max_wait=self.max_wait)
+                    self.loggit.info('Index "{0}" successfully shrunk to "{1}"'.format(idx, target))
                     # Do post-shrink steps
                     # Unblock writes on index (just in case)
                     self._unblock_writes(idx)

curator/defaults/option_defaults.py

@@ -247,7 +247,7 @@ def shrink_prefix():
     return { Optional('shrink_prefix', default=''): Any(str, unicode, None) }
 
 def shrink_suffix():
-    return { Optional('shrink_suffix', default=''): Any(str, unicode, None) }
+    return { Optional('shrink_suffix', default='-shrink'): Any(str, unicode, None) }
 
 def skip_repo_fs_check():
     return { Optional('skip_repo_fs_check', default=False): Any(bool, All(Any(str, unicode), Boolean())) }

curator/utils.py

@@ -1638,8 +1638,8 @@ def wait_for_it(
         else:
             logger.debug(
                 'Action "{0}" not yet complete, {1} total seconds elapsed. '
-                'Waiting {1} seconds before checking '
-                'again.'.format(action, wait_interval))
+                'Waiting {2} seconds before checking '
+                'again.'.format(action, elapsed, wait_interval))
             time.sleep(wait_interval)
 
     logger.debug('Result: {0}'.format(result))
@@ -1702,4 +1702,4 @@ def node_id_to_name(client, node_id):
     else:
         logger.error('No node_id found matching: "{0}"'.format(node_id))
     logger.debug('Name associated with node_id "{0}": {1}'.format(node_id, name))
-    return None
+    return name

docs/Changelog.rst

@@ -33,6 +33,7 @@ Changelog
     limits the number of documents reindexed.  The other is for batch sizing.
     The batch sizing option was missing from the schema validator.  This has
     been corrected.  Reported in #1038 (untergeek)
+  * A few sundry logging and notification changes were made.
 
 5.1.2 (08 August 2017)
 ----------------------

docs/asciidoc/index.asciidoc

@@ -1,4 +1,4 @@
-:curator_version: 5.2.0.rc1
+:curator_version: 5.2.0.rc2
 :curator_major: 5
 :curator_doc_tree: 5.2
 :es_py_version: 5.4.0