crush/CrushWrapper: remove_item, bucket_remove_item whitespace

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/crush/CrushWrapper.cc b/src/crush/CrushWrapper.cc
index 6e53b2fe60575e8e45549b6a6cfd2b252ccf771f..b805fd97f7825ac19c7f36c9e8bf7d35636ee7ba 100644 (file)
--- a/src/crush/CrushWrapper.cc
+++ b/src/crush/CrushWrapper.cc
@@ -405,14 +405,16 @@ int CrushWrapper::remove_root(int item, bool unused)
 
 int CrushWrapper::remove_item(CephContext *cct, int item, bool unlink_only)
 {
-  ldout(cct, 5) << "remove_item " << item << (unlink_only ? " unlink_only":"") << dendl;
+  ldout(cct, 5) << "remove_item " << item
+               << (unlink_only ? " unlink_only":"") << dendl;
 
   int ret = -ENOENT;
 
   if (item < 0 && !unlink_only) {
     crush_bucket *t = get_bucket(item);
     if (IS_ERR(t)) {
-      ldout(cct, 1) << "remove_item bucket " << item << " does not exist" << dendl;
+      ldout(cct, 1) << "remove_item bucket " << item << " does not exist"
+                   << dendl;
       return -ENOENT;
     }
 
@@ -1678,7 +1680,8 @@ int CrushWrapper::bucket_remove_item(crush_bucket *bucket, int item)
       assert(weight_set->size - 1 == new_size);
       for (__u32 k = position; k < new_size; k++)
        weight_set->weights[k] = weight_set->weights[k+1];
-      weight_set->weights = (__u32*)realloc(weight_set->weights, new_size * sizeof(__u32));
+      weight_set->weights = (__u32*)realloc(weight_set->weights,
+                                           new_size * sizeof(__u32));
       weight_set->size = new_size;
     }
     if (arg->ids_size) {

diff --git a/src/test/crush/crush-choose-args-expected-one-more-0.txt b/src/test/crush/crush-choose-args-expected-one-more-0.txt
index 2154da2d2fdae56cfaf31c0c63e45958ea279653..23068e68c865c43a90952038d4ca49aaa99004fa 100644 (file)
--- a/src/test/crush/crush-choose-args-expected-one-more-0.txt
+++ b/src/test/crush/crush-choose-args-expected-one-more-0.txt
@@ -58,8 +58,8 @@ choose_args 0 {
   {
     bucket_id -1
     weight_set [
-      [ 6.000 ]
-      [ 7.000 ]
+      [ 2.000 ]
+      [ 1.000 ]
     ]
     ids [ -10 ]
   }
@@ -67,7 +67,7 @@ choose_args 0 {
     bucket_id -2
     weight_set [
       [ 2.000 0.000 ]
-      [ 2.000 0.000 ]
+      [ 1.000 0.000 ]
     ]
     ids [ -20 1 ]
   }

diff --git a/src/test/crush/crush-choose-args.sh b/src/test/crush/crush-choose-args.sh
index 709d875d80074a393795f23de2528bd145da3e18..493d5d40f2d2a72130be0efea2a56618673d3c54 100755 (executable)
--- a/src/test/crush/crush-choose-args.sh
+++ b/src/test/crush/crush-choose-args.sh
@@ -52,6 +52,7 @@ function TEST_choose_args_update() {
     run_mon $dir a || return 1
     run_osd $dir 0 || return 1
 
+    ceph osd set-require-min-compat-client luminous
     ceph osd getcrushmap > $dir/map || return 1
     crushtool -d $dir/map -o $dir/map.txt || return 1
     sed -i -e '/end crush map/d' $dir/map.txt
@@ -105,6 +106,8 @@ function TEST_no_update_weight_set() {
     run_mon $dir a || return 1
     run_osd $dir 0 || return 1
 
+    ceph osd set-require-min-compat-client luminous
+    ceph osd crush tree
     ceph osd getcrushmap > $dir/map || return 1
     crushtool -d $dir/map -o $dir/map.txt || return 1
     sed -i -e '/end crush map/d' $dir/map.txt
@@ -114,8 +117,8 @@ choose_args 0 {
   {
     bucket_id -1
     weight_set [
-      [ 6.000 ]
-      [ 7.000 ]
+      [ 2.000 ]
+      [ 1.000 ]
     ]
     ids [ -10 ]
   }
@@ -123,7 +126,7 @@ choose_args 0 {
     bucket_id -2
     weight_set [
       [ 2.000 ]
-      [ 2.000 ]
+      [ 1.000 ]
     ]
     ids [ -20 ]
   }
@@ -133,15 +136,18 @@ choose_args 0 {
 EOF
     crushtool -c $dir/map.txt -o $dir/map-new || return 1
     ceph osd setcrushmap -i $dir/map-new || return 1
+    ceph osd crush tree
 
 
     run_osd $dir 1 || return 1
+    ceph osd crush tree
     ceph osd getcrushmap > $dir/map-one-more || return 1
     crushtool -d $dir/map-one-more -o $dir/map-one-more.txt || return 1
     cat $dir/map-one-more.txt
     diff -u $dir/map-one-more.txt $CEPH_ROOT/src/test/crush/crush-choose-args-expected-one-more-0.txt || return 1
 
     destroy_osd $dir 1 || return 1
+    ceph osd crush tree
     ceph osd getcrushmap > $dir/map-one-less || return 1
     crushtool -d $dir/map-one-less -o $dir/map-one-less.txt || return 1
     diff -u $dir/map-one-less.txt $dir/map.txt || return 1