Merge pull request #2928 from StackStorm/2_0_1_patch_release

Additional changes for v2.0.1 release

Author: m4dcoder

CHANGELOG.rst

@@ -1,11 +1,7 @@
 Changelog
 =========
 
-In development
---------------
-
-
-2.0.1 - September 23, 2016
+2.0.1 - September 30, 2016
 --------------------------
 
 * Fix ``st2 execution get`` command so now ``--attr`` argument correctly works with child
@@ -19,6 +15,9 @@ In development
   the ``st2 trace list`` CLI command. (improvement)
 * Fix a bug with action default parameter values not supporting Jinja template
   notation for parameters of type ``object``. (bug fix, improvement)
+* Fix ``--user`` / ``-u`` argument in the ``st2 key delete`` CLI command.
+* Retry connecting to RabbitMQ on services start-up if connecting fails because
+  of an intermediate network error or similar. (improvements)
 
 2.0.0 - August 31, 2016
 -----------------------

st2client/st2client/commands/keyvalue.py

@@ -184,6 +184,7 @@ def run(self, args, **kwargs):
         scope = getattr(args, 'scope', DEFAULT_SCOPE)
         kwargs['params'] = {}
         kwargs['params']['scope'] = scope
+        kwargs['params']['user'] = args.user
         instance = self.get_resource(resource_id, **kwargs)
 
         if not instance:

st2common/st2common/config.py

@@ -129,7 +129,11 @@ def register_opts(ignore_errors=False):
         cfg.StrOpt('url', default='amqp://guest:guest@127.0.0.1:5672//',
                    help='URL of the messaging server.'),
         cfg.ListOpt('cluster_urls', default=[],
-                    help='URL of all the nodes in a messaging service cluster.')
+                    help='URL of all the nodes in a messaging service cluster.'),
+        cfg.IntOpt('connection_retries', default=10,
+                   help='How many times should we retry connection before failing.'),
+        cfg.IntOpt('connection_retry_wait', default=10000,
+                   help='How long should we wait between connection retries.')
     ]
     do_register_opts(messaging_opts, 'messaging', ignore_errors)
 

st2common/st2common/script_setup.py

@@ -30,7 +30,7 @@
 from st2common.service_setup import db_setup
 from st2common.service_setup import db_teardown
 from st2common.logging.filters import LogLevelFilter
-from st2common.transport.bootstrap_utils import register_exchanges
+from st2common.transport.bootstrap_utils import register_exchanges_with_retry
 
 __all__ = [
     'setup',
@@ -86,7 +86,7 @@ def setup(config, setup_db=True, register_mq_exchanges=True):
         db_setup()
 
     if register_mq_exchanges:
-        register_exchanges()
+        register_exchanges_with_retry()
 
 
 def teardown():

st2common/st2common/service_setup.py

@@ -27,7 +27,7 @@
 from st2common.models import db
 from st2common.constants.logging import DEFAULT_LOGGING_CONF_PATH
 from st2common.persistence import db_init
-from st2common.transport.bootstrap_utils import register_exchanges
+from st2common.transport.bootstrap_utils import register_exchanges_with_retry
 from st2common.signal_handlers import register_common_signal_handlers
 from st2common.util.debugging import enable_debugging
 from st2common.models.utils.profiling import enable_profiling
@@ -99,7 +99,7 @@ def setup(service, config, setup_db=True, register_mq_exchanges=True,
         db_setup()
 
     if register_mq_exchanges:
-        register_exchanges()
+        register_exchanges_with_retry()
 
     if register_signal_handlers:
         register_common_signal_handlers()

st2common/st2common/transport/bootstrap.py

@@ -16,7 +16,7 @@
 import logging
 import st2common.config as config
 
-from st2common.transport.bootstrap_utils import register_exchanges
+from st2common.transport.bootstrap_utils import register_exchanges_with_retry
 
 
 def _setup():
@@ -29,7 +29,7 @@ def _setup():
 
 def main():
     _setup()
-    register_exchanges()
+    register_exchanges_with_retry()
 
 
 # The scripts sets up Exchanges in RabbitMQ.

st2common/st2common/transport/bootstrap_utils.py

@@ -13,6 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import retrying
+import socket
+from oslo_config import cfg
 from kombu import Connection
 from st2common import log as logging
 from st2common.transport import utils as transport_utils
@@ -69,3 +72,12 @@ def wrapped_register_exchanges(connection, channel):
                                       retry_wrapper=retry_wrapper)
 
         retry_wrapper.run(connection=conn, wrapped_callback=wrapped_register_exchanges)
+
+
+def register_exchanges_with_retry():
+    retrying_obj = retrying.Retrying(
+        retry_on_exception=socket.error,
+        wait_fixed=cfg.CONF.messaging.connection_retry_wait,
+        stop_max_attempt_number=cfg.CONF.messaging.connection_retries
+    )
+    return retrying_obj.call(register_exchanges)