src/cluster_client.cpp

@@ -169,48 +169,46 @@ void cluster_client_t::calc_wait(cluster_op_t *op)
 
 void cluster_client_t::inc_wait(uint64_t opcode, uint64_t flags, cluster_op_t *next, int inc)
 {
-    if (opcode != OSD_OP_WRITE && opcode != OSD_OP_SYNC)
+    if (opcode == OSD_OP_WRITE)
     {
-        return;
+        while (next)
-    }
-    cluster_op_t *bh_ops_local[32], **bh_ops = bh_ops_local;
-    int bh_op_count = 0, bh_op_max = 32;
-    while (next)
-    {
-        auto n2 = next->next;
-        if (opcode == OSD_OP_WRITE
-            ? (next->opcode == OSD_OP_SYNC && (!(flags & OP_IMMEDIATE_COMMIT) || enable_writeback) ||
-                next->opcode == OSD_OP_WRITE && (flags & OP_FLUSH_BUFFER) && !(next->flags & OP_FLUSH_BUFFER))
-            : (next->opcode == OSD_OP_SYNC || next->opcode == OSD_OP_WRITE))
         {
-            next->prev_wait += inc;
+            auto n2 = next->next;
-            assert(next->prev_wait >= 0);
+            if (next->opcode == OSD_OP_SYNC && (!(flags & OP_IMMEDIATE_COMMIT) || enable_writeback) ||
-            if (!next->prev_wait)
+                next->opcode == OSD_OP_WRITE && (flags & OP_FLUSH_BUFFER) && !(next->flags & OP_FLUSH_BUFFER))
             {
-                // Kind of std::vector with local "small vector optimisation"
+                next->prev_wait += inc;
-                if (bh_op_count >= bh_op_max)
+                assert(next->prev_wait >= 0);
+                if (!next->prev_wait)
                 {
-                    bh_op_max *= 2;
+                    if (next->opcode == OSD_OP_SYNC)
-                    cluster_op_t **n = (cluster_op_t**)malloc_or_die(sizeof(cluster_op_t*) * bh_op_max);
+                        continue_sync(next);
-                    memcpy(n, bh_ops, sizeof(cluster_op_t*) * bh_op_count);
+                    else
-                    bh_ops = n;
+                        continue_rw(next);
                 }
-                bh_ops[bh_op_count++] = next;
             }
+            next = n2;
         }
-        next = n2;
     }
-    for (int i = 0; i < bh_op_count; i++)
+    else if (opcode == OSD_OP_SYNC)
     {
-        cluster_op_t *next = bh_ops[i];
+        while (next)
-        if (next->opcode == OSD_OP_SYNC)
+        {
-            continue_sync(next);
+            auto n2 = next->next;
-        else
+            if (next->opcode == OSD_OP_SYNC || next->opcode == OSD_OP_WRITE)
-            continue_rw(next);
+            {
-    }
+                next->prev_wait += inc;
-    if (bh_ops != bh_ops_local)
+                assert(next->prev_wait >= 0);
-    {
+                if (!next->prev_wait)
-        free(bh_ops);
+                {
+                    if (next->opcode == OSD_OP_SYNC)
+                        continue_sync(next);
+                    else
+                        continue_rw(next);
+                }
+            }
+            next = n2;
+        }
     }
 }
 

tests/test_heal.sh

@@ -7,7 +7,7 @@ if [[ "$SCHEME" = "ec" ]]; then
     PG_DATA_SIZE=${PG_DATA_SIZE:-2}
     PG_MINSIZE=${PG_MINSIZE:-3}
 fi
-OSD_COUNT=${OSD_COUNT:-7}
+OSD_COUNT=7
 PG_COUNT=32
 . `dirname $0`/run_3osds.sh
 check_qemu
@@ -29,7 +29,7 @@ kill_osds()
     kill -9 $OSD1_PID
     $ETCDCTL del /vitastor/osd/state/1
 
-    for i in $(seq 2 $OSD_COUNT); do
+    for i in 2 3 4 5 6 7; do
         sleep 15
         echo Killing OSD $i and starting OSD $((i-1))
         p=OSD${i}_PID
@@ -40,8 +40,8 @@ kill_osds()
     done
 
     sleep 5
-    echo Starting OSD $OSD_COUNT
+    echo Starting OSD 7
-    start_osd $OSD_COUNT
+    start_osd 7
 
     sleep 5
 }