Test etcd schizophrenia

Fix volume_size_info in PVE VitastorPlugin
2025-07-02 18:38:04 +03:00 · 2025-06-18 12:38:09 +03:00
2 changed files with 10 additions and 3 deletions
--- a/patches/VitastorPlugin.pm
+++ b/patches/VitastorPlugin.pm
@@ -410,8 +410,8 @@ sub volume_size_info
    my $prefix = defined $scfg->{vitastor_prefix} ? $scfg->{vitastor_prefix} : 'pve/';
    my ($vtype, $name, $vmid) = $class->parse_volname($volname);
    my $info = _process_list($scfg, $storeid, run_cli($scfg, [ 'ls', $prefix.$name ]))->[0];
-    #return wantarray ? ($size, $format, $used, $parent, $st->ctime) : $size;
-    return $info->{size};
+    # (size, format, used, parent, ctime)
+    return wantarray ? ($info->{size}, $info->{format}, $info->{size}, $info->{parent}, 0) : $info->{size};
 }

 sub volume_resize
--- a/src/osd/osd_cluster.cpp
+++ b/src/osd/osd_cluster.cpp
@@ -1051,8 +1051,15 @@ void osd_t::report_pg_states()
    etcd_reporting_pg_state = true;
    st_cli.etcd_txn(json11::Json::object {
        { "compare", checks }, { "success", success }, { "failure", failure }
-    }, st_cli.etcd_quick_timeout, 0, 0, [this, reporting_pgs](std::string err, json11::Json data)
+    }, st_cli.etcd_quick_timeout, 0, 0, [this, reporting_pgs, success_count = success.size(), failure_count = failure.size()](std::string err, json11::Json data)
    {
+        int expected_count = (data["succeeded"].bool_value() ? success_count : failure_count);
+        if (expected_count != data["responses"].array_items().size())
+        {
+            printf("Unexpected response from etcd - 'responses' count (%u) isn't equal to expected (%u), stopping\n",
+                data["responses"].array_items().size(), expected_count);
+            force_stop(1);
+        }
        etcd_reporting_pg_state = false;
        if (!data["succeeded"].bool_value())
        {
Author	SHA1	Message	Date
Vitaliy Filippov	88c9f9bd6d	Test etcd schizophrenia Some checks failed Test / test_write_xor (push) Successful in 36s Details Test / test_write_iothreads (push) Successful in 38s Details Test / test_write_no_same (push) Successful in 9s Details Test / test_rebalance_verify_ec_imm (push) Successful in 1m41s Details Test / test_heal_pg_size_2 (push) Successful in 2m19s Details Test / test_heal_local_read (push) Successful in 2m18s Details Test / test_heal_ec (push) Successful in 2m20s Details Test / test_etcd_fail (push) Failing after 10m5s Details Test / test_heal_antietcd (push) Successful in 2m18s Details Test / test_heal_csum_32k_dmj (push) Successful in 2m19s Details Test / test_heal_csum_32k_dj (push) Successful in 2m19s Details Test / test_heal_csum_32k (push) Successful in 2m19s Details Test / test_resize (push) Successful in 14s Details Test / test_resize_auto (push) Successful in 9s Details Test / test_heal_csum_4k_dmj (push) Successful in 2m19s Details Test / test_heal_csum_4k_dj (push) Successful in 2m19s Details Test / test_heal_csum_4k (push) Successful in 2m19s Details Test / test_osd_tags (push) Successful in 9s Details Test / test_snapshot_pool2 (push) Successful in 15s Details Test / test_enospc (push) Successful in 13s Details Test / test_enospc_imm (push) Successful in 12s Details Test / test_enospc_xor (push) Successful in 14s Details Test / test_enospc_imm_xor (push) Successful in 13s Details Test / test_scrub (push) Successful in 15s Details Test / test_scrub_zero_osd_2 (push) Successful in 14s Details Test / test_scrub_xor (push) Successful in 14s Details Test / test_scrub_pg_size_3 (push) Successful in 14s Details Test / test_scrub_pg_size_6_pg_minsize_4_osd_count_6_ec (push) Successful in 17s Details Test / test_nfs (push) Successful in 12s Details Test / test_scrub_ec (push) Successful in 17s Details	2025-07-02 18:38:04 +03:00
Vitaliy Filippov	f515fcce62	Fix volume_size_info in PVE VitastorPlugin	2025-06-18 12:38:09 +03:00