Merge ~mariosplivalo/charm-mongodb:status-fix into ~mongodb-charmers/charm-mongodb:master

[Mario Splivalo]

This will add update-status hook along with several utility functions that help display mongodb replicaset status in 'juju status', along with the workflow state.

It also calls status-set inside config-changed and replicaset-relation-changed hooks so that status is updated while replicaset is being formed and/or units added to replicaset.

[Stuart Bishop (stub)]

Looks good.

get_replicaset_status() may return None if things are really screwed, but that is easily fixed. Commented on inline.

review: Approve

diff --git a/hooks/hooks.py b/hooks/hooks.py
index d3774a7..c8fbece 100755
--- a/hooks/hooks.py
+++ b/hooks/hooks.py
@@ -13,6 +13,7 @@ import socket
 import subprocess
 import sys
 import time
+import pprint
 
 try:
     import yaml  # flake8: noqa
@@ -58,7 +59,9 @@ from charmhelpers.core.hookenv import (
     Hooks,
     DEBUG,
     WARNING,
-    is_leader
+    is_leader,
+    status_set,
+    application_version_set,
 )
 
 from charmhelpers.core.hookenv import log as juju_log
@@ -66,7 +69,6 @@ from charmhelpers.core.hookenv import log as juju_log
 from charmhelpers.payload.execd import execd_preinstall
 
 from charmhelpers.contrib.hahelpers.cluster import (
-    oldest_peer,
     peer_units
 )
 
@@ -920,6 +922,7 @@ def arm64_trusty_quirk():
 @hooks.hook('install.real')
 def install_hook():
     juju_log('Begin install hook.')
+    status_set('maintenance', 'Installing packages')
     execd_preinstall()
     juju_log("Installing mongodb")
     add_source(config('source'), config('key'))
@@ -935,7 +938,7 @@ def install_hook():
 @hooks.hook('config-changed')
 def config_changed():
     juju_log("Entering config_changed")
-    print "Entering config_changed"
+    status_set('maintenance', 'Configuring unit')
     config_data = config()
     print "config_data: ", config_data
     mongodb_config = open(default_mongodb_config).read()
@@ -1009,6 +1012,7 @@ def config_changed():
     write_logrotate_config(config_data)
 
     # restart mongodb
+    status_set('maintenance', 'Restarting mongod')
     restart_mongod()
 
     # attach to replSet ( if needed )
@@ -1069,6 +1073,8 @@ def config_changed():
         open_port(config_data['mongos_port'])
 
     update_nrpe_config()
+    application_version_set(get_mongod_version())
+    update_status()
 
     print "About to leave config_changed"
     return(True)
@@ -1148,6 +1154,7 @@ def replica_set_relation_joined():
     if enable_replset(my_replset):
         juju_log('Restarting mongodb after config change (enable replset)',
                  level=DEBUG)
+        status_set('maintenance', 'Restarting mongod to enable replicaset')
         restart_mongod()
 
     relation_set(relation_id(), {
@@ -1157,6 +1164,8 @@ def replica_set_relation_joined():
         'install-order': my_install_order,
         'type': 'replset',
         })
+    
+    update_status()
     juju_log("replica_set_relation_joined-finish")
 
 
@@ -1165,7 +1174,8 @@ def am_i_primary():
     for i in xrange(10):
         try:
             r = run_admin_command(c, 'replSetGetStatus')
-            juju_log('am_i_primary: replSetGetStatus returned: %s' % str(r),
+            pretty_r = pprint.pformat(r)
+            juju_log('am_i_primary: replSetGetStatus returned: %s' % pretty_r,
                      level=DEBUG)
             return r['myState'] == MONGO_PRIMARY
         except OperationFailure as e:
@@ -1191,6 +1201,42 @@ def am_i_primary():
     raise TimeoutException('Unable to determine if local unit is primary')
 
 
+def get_replicaset_status():
+    """Connect to mongod and get the status of replicaset
+    This function is used mainly within update_status() to display 
+    replicaset statue in 'juju status' output
+    
+    :returns string: can be any of replicaset states 
+        (https://docs.mongodb.com/manual/reference/replica-states/)
+        or can be the string of an exception while getting the status
+    """
+    
+    c = MongoClient('localhost')
+    try:
+        r = run_admin_command(c, 'replSetGetStatus')
+        r_pretty = pprint.pformat(r)
+        juju_log('get_replicaset_status() failed to get replicaset state:' +
+                 r_pretty, 'WARN')
+        for member in r['members']:
+            if 'self' in member:
+                return member['stateStr']
+        return 'Unknown'
+
+    except OperationFailure as e:
+        if 'not running with --replSet' in str(e):
+            return 'not in replicaset'
+        else:
+            return str(e)
+    
+def get_mongod_version():
+    """ Connects to mongod and get the db.version() output
+    Mainly used for application_set_version in config-changed hook
+    """
+    
+    c = MongoClient('localhost')
+    return c.server_info()['version']
+    
+
 @hooks.hook('replica-set-relation-changed')
 def replica_set_relation_changed():
     private_address = unit_get('private-address')
@@ -1208,6 +1254,7 @@ def replica_set_relation_changed():
     # Initialize the replicaset - we do this only on the leader!
     if is_leader():
         juju_log('Initializing replicaset')
+        status_set('maintenance', 'Initializing replicaset')
         init_replset()
 
     unit = "%s:%s" % (private_address, config('port'))
@@ -1217,10 +1264,14 @@ def replica_set_relation_changed():
     if am_i_primary():
         juju_log('Adding new secondary... %s' % unit_remote, level=DEBUG)
         join_replset(unit, unit_remote)
+        
+    while update_status <> 'active':
+        time.sleep(5)
 
     juju_log('replica_set_relation_changed-finish')
 
 
+
 @hooks.hook('replica-set-relation-departed')
 def replica_set_relation_departed():
     juju_log('replica_set_relation_departed-start')
@@ -1437,6 +1488,37 @@ def uprade_charm():
     remove_replset_from_upstart()
     juju_log('upgrade-charm: removing --rest from upstart script')
     remove_rest_from_upstart()
+    
+    
[e-mail]('update-status')
+def update_status():
+    """
+    Returns: workload_state (so that some hooks know they need to re-run
+    update_status if needed)
+    """
+    
+    juju_log('$$$ update_status()', 'DEBUG')
+    
+    mongo_status = get_replicaset_status()
+    if mongo_status in ('PRIMARY', 'SECONDARY'):
+        print ' ## mongo_status in PRI/SEC'
+        workload = 'active'
+        status = 'Unit is ready as ' + mongo_status 
+    elif mongo_status in ('not in replicaset',):
+        print ' ## mongo_status in "not in replicaset"'
+        workload = 'active'
+        status = 'Unit is ready, ' + mongo_status
+    else:
+        workload = 'maintenance'
+        status = mongo_status
+        print ' ## mongo_status something else: ',  status
+        print ' #> forcing "return False" for update_status()'
+
+    juju_log('  $ status:' + status, 'DEBUG')
+    juju_log('  $ workload: ' + workload, 'DEBUG')
+    
+    return workload
+    
 
 
 def run(command, exit_on_error=True):
diff --git a/hooks/update-status b/hooks/update-status
new file mode 120000
index 0000000..9416ca6
--- /dev/null
+++ b/hooks/update-status
@@ -0,0 +1 @@
+hooks.py
\ No newline at end of file