Support setting a CRUSH weight on new OSDs

client-cli/pvc.py

@@ -950,13 +950,18 @@ def ceph_osd():
 @click.argument(
     'device'
 )
-def ceph_osd_add(node, device):
+@click.option(
+    '-w', '--weight', 'weight',
+    default=1.0, show_default=True,
+    help='Weight of the OSD within the CRUSH map.'
+)
+def ceph_osd_add(node, device, weight):
     """
     Add a new Ceph OSD on node NODE with block device DEVICE to the cluster.
     """
 
     zk_conn = pvc_common.startZKConnection(zk_host)
-    retcode, retmsg = pvc_ceph.add_osd(zk_conn, node, device)
+    retcode, retmsg = pvc_ceph.add_osd(zk_conn, node, device, weight)
     cleanup(retcode, retmsg, zk_conn)
 
 ###############################################################################

client-common/ceph.py

@@ -57,6 +57,31 @@ def verifyOSDBlock(zk_conn, node, device):
             return osd
     return None
 
+# Format byte sizes in human-readable units
+def format_bytes(databytes):
+    unit_matrix = {
+        'K': 1024,
+        'M': 1024*1024,
+        'G': 1024*1024*1024,
+        'T': 1024*1024*1024*1024,
+        'P': 1024*1024*1024*1024*1024
+    }
+    databytes_formatted = ''
+    if databytes > 9999:
+        for unit in sorted(unit_matrix, key=unit_matrix.get, reverse=True):
+            new_bytes = int(math.ceil(databytes / unit_matrix[unit]))
+            # Round up if 5 or more digits
+            if new_bytes > 9999:
+                # We can jump down another level
+                continue
+            else:
+                # We're at the end, display with this size
+                databytes_formatted = '{}{}'.format(new_bytes, unit)
+    else:
+        databytes_formatted = '{}B'.format(databytes)
+
+    return databytes_formatted
+
 #
 # Cluster search functions
 #
@@ -69,6 +94,10 @@ def getOSDInformation(zk_conn, osd_id):
     # Parse the stats data
     osd_stats_raw = zkhandler.readdata(zk_conn, '/ceph/osds/{}/stats'.format(osd_id))
     osd_stats = dict(json.loads(osd_stats_raw))
+    # Deal with the size
+    databytes = osd_stats['kb'] * 1024
+    databytes_formatted = format_bytes(databytes)
+    osd_stats['size'] = databytes_formatted
     return osd_stats
 
 def getCephOSDs(zk_conn):
@@ -83,6 +112,7 @@ def formatOSDList(zk_conn, osd_list):
     osd_up_colour = dict()
     osd_in = dict()
     osd_in_colour = dict()
+    osd_size = dict()
     osd_weight = dict()
     osd_pgs = dict()
     osd_node = dict()
@@ -94,12 +124,11 @@ def formatOSDList(zk_conn, osd_list):
     osd_wrdata = dict()
     osd_rdops = dict()
     osd_rddata = dict()
-    osd_state = dict()
-    osd_state_colour = dict()
 
     osd_id_length = 3
     osd_up_length = 4
     osd_in_length = 4
+    osd_size_length = 5
     osd_weight_length = 7
     osd_pgs_length = 4
     osd_node_length = 5
@@ -150,6 +179,12 @@ def formatOSDList(zk_conn, osd_list):
             osd_in[osd] = 'No'
             osd_in_colour[osd] = ansiprint.red()
 
+        # Set the size and length
+        osd_size[osd] = osd_stats['size']
+        _osd_size_length = len(str(osd_size[osd])) + 1
+        if _osd_size_length > osd_size_length:
+            osd_size_length = _osd_size_length
+
         # Set the weight and length
         osd_weight[osd] = osd_stats['weight']
         _osd_weight_length = len(str(osd_weight[osd])) + 1
@@ -206,6 +241,7 @@ def formatOSDList(zk_conn, osd_list):
 {osd_node: <{osd_node_length}} \
 {osd_up: <{osd_up_length}} \
 {osd_in: <{osd_in_length}} \
+{osd_size: <{osd_size_length}} \
 {osd_weight: <{osd_weight_length}} \
 {osd_pgs: <{osd_pgs_length}} \
 Space: {osd_used: <{osd_used_length}} \
@@ -223,6 +259,7 @@ Read: {osd_rdops: <{osd_rdops_length}} \
             osd_node_length=osd_node_length,
             osd_up_length=osd_up_length,
             osd_in_length=osd_in_length,
+            osd_size_length=osd_size_length,
             osd_weight_length=osd_weight_length,
             osd_pgs_length=osd_pgs_length,
             osd_used_length=osd_used_length,
@@ -237,6 +274,7 @@ Read: {osd_rdops: <{osd_rdops_length}} \
             osd_node='Node',
             osd_up='Up',
             osd_in='In',
+            osd_size='Size',
             osd_weight='Weight',
             osd_pgs='PGs',
             osd_used='Used',
@@ -256,6 +294,7 @@ Read: {osd_rdops: <{osd_rdops_length}} \
 {osd_node: <{osd_node_length}} \
 {osd_up_colour}{osd_up: <{osd_up_length}}{end_colour} \
 {osd_in_colour}{osd_in: <{osd_in_length}}{end_colour} \
+{osd_size: <{osd_size_length}} \
 {osd_weight: <{osd_weight_length}} \
 {osd_pgs: <{osd_pgs_length}} \
        {osd_used: <{osd_used_length}} \
@@ -274,6 +313,7 @@ Read: {osd_rdops: <{osd_rdops_length}} \
                 osd_node_length=osd_node_length,
                 osd_up_length=osd_up_length,
                 osd_in_length=osd_in_length,
+                osd_size_length=osd_size_length,
                 osd_weight_length=osd_weight_length,
                 osd_pgs_length=osd_pgs_length,
                 osd_used_length=osd_used_length,
@@ -290,6 +330,7 @@ Read: {osd_rdops: <{osd_rdops_length}} \
                 osd_up=osd_up[osd],
                 osd_in_colour=osd_in_colour[osd],
                 osd_in=osd_in[osd],
+                osd_size=osd_size[osd],
                 osd_weight=osd_weight[osd],
                 osd_pgs=osd_pgs[osd],
                 osd_used=osd_used[osd],
@@ -316,29 +357,9 @@ def getPoolInformation(zk_conn, name):
     pool_stats_raw = zkhandler.readdata(zk_conn, '/ceph/pools/{}/stats'.format(name))
     pool_stats = dict(json.loads(pool_stats_raw))
     # Deal with the size issues
-    size_matrix = {
-        'b': 1,
-        'K': 1024,
-        'M': 1024*1024,
-        'G': 1024*1024*1024,
-        'T': 1024*1024*1024*1024,
-        'P': 1024*1024*1024*1024*1024
-    }
     for datatype in 'size_bytes', 'read_bytes', 'write_bytes':
         databytes = pool_stats[datatype]
-        databytes_formatted = ''
+        databytes_formatted = format_bytes(databytes)
-        if databytes > 9999:
-            for unit in sorted(size_matrix, key=size_matrix.get, reverse=True):
-                new_bytes = int(math.ceil(databytes / size_matrix[unit]))
-                # Round up if 5 or more digits
-                if new_bytes > 9999:
-                    # We can jump down another level
-                    continue
-                else:
-                    # We're at the end, display with this size
-                    databytes_formatted = '{}{}'.format(new_bytes, unit)
-        else:
-            databytes_formatted = '{}B'.format(databytes)
         new_name = datatype.replace('bytes', 'formatted')
         pool_stats[new_name] = databytes_formatted
     return pool_stats
@@ -543,7 +564,7 @@ def get_status(zk_conn):
     click.echo('')
     return True, ''
 
-def add_osd(zk_conn, node, device):
+def add_osd(zk_conn, node, device, weight):
     # Verify the target node exists
     if not common.verifyNode(zk_conn, node):
         return False, 'ERROR: No node named "{}" is present in the cluster.'.format(node)
@@ -554,7 +575,7 @@ def add_osd(zk_conn, node, device):
         return False, 'ERROR: Block device {} on node {} is used by OSD {}'.format(device, node, block_osd)
 
     # Tell the cluster to create a new OSD for the host
-    add_osd_string = 'osd_add {},{}'.format(node, device) 
+    add_osd_string = 'osd_add {},{},{}'.format(node, device, weight) 
     zkhandler.writedata(zk_conn, {'/ceph/cmd': add_osd_string})
     # Wait 1/2 second for the cluster to get the message and start working
     time.sleep(0.5)

node-daemon/pvcd/CephInstance.py

@@ -69,7 +69,7 @@ class CephOSDInstance(object):
             if data and data != self.stats:
                 self.stats = json.loads(data)
 
-def add_osd(zk_conn, logger, node, device):
+def add_osd(zk_conn, logger, node, device, weight):
     # We are ready to create a new OSD on this node
     logger.out('Creating new OSD disk', state='i')
     try:
@@ -117,8 +117,9 @@ def add_osd(zk_conn, logger, node, device):
 
         # 5. Add it to the crush map
         retcode, stdout, stderr = common.run_os_command(
-            'ceph osd crush add osd.{osdid} 1.0 root=default host={node}'.format(
+            'ceph osd crush add osd.{osdid} {weight} root=default host={node}'.format(
                 osdid=osd_id,
+                weight=weight,
                 node=node
             )
         )

node-daemon/pvcd/Daemon.py

@@ -669,13 +669,13 @@ def cmd(data, stat, event=''):
 
         # Adding a new OSD
         if command == 'osd_add':
-            node, device = args.split(',')
+            node, device, weight = args.split(',')
             if node == this_node.name:
                 # Lock the command queue
                 lock = zkhandler.writelock(zk_conn, '/ceph/cmd')
                 with lock:
                     # Add the OSD
-                    result = CephInstance.add_osd(zk_conn, logger, node, device)
+                    result = CephInstance.add_osd(zk_conn, logger, node, device, weight)
                     # Command succeeded
                     if result:
                         # Update the command queue
@@ -967,6 +967,7 @@ def update_zookeeper():
                 'utilization': osd['utilization'],
                 'var': osd['var'],
                 'pgs': osd['pgs'],
+                'kb': osd['kb'],
             }
         })
     # Parse the status data