From 5816846d00e92ea38e39986993047d8a05b78760 Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Thu, 25 Apr 2019 09:25:22 +0200 Subject: [PATCH] ganeti upgrade, ceph rbd showmapped -p broke --- doc/2019-04-25-update.txt | 10 ++++++++++ doc/rbd-showmapped-p.diff | 20 ++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 doc/2019-04-25-update.txt create mode 100644 doc/rbd-showmapped-p.diff diff --git a/doc/2019-04-25-update.txt b/doc/2019-04-25-update.txt new file mode 100644 index 0000000..d00f3d0 --- /dev/null +++ b/doc/2019-04-25-update.txt @@ -0,0 +1,10 @@ +applied rbd-showmapped-p.diff to remove errors: + +Thu Apr 25 09:20:23 2019 - ERROR: instance odin.ffzg.hr: couldn't retrieve status for disk/0 on r1u32.gnt.ffzg.hr: rbd showmapped failed (exited with exit code 1): rbd: unrecognised option '-p'\n +Thu Apr 25 09:20:23 2019 - ERROR: instance odin.ffzg.hr: couldn't retrieve status for disk/1 on r1u32.gnt.ffzg.hr: rbd showmapped failed (exited with exit code 1): rbd: unrecognised option '-p'\n +Thu Apr 25 09:20:23 2019 - ERROR: instance gray: couldn't retrieve status for disk/0 on r1u32.gnt.ffzg.hr: rbd showmapped failed (exited with exit code 1): rbd: unrecognised option '-p'\n + +root@r1u30:/home/dpavlin# gnt-cluster renew-crypto --new-cluster-certificate --new-rapi-certificate --new-spice-certifi +cate + + diff --git a/doc/rbd-showmapped-p.diff b/doc/rbd-showmapped-p.diff new file mode 100644 index 0000000..c596949 --- /dev/null +++ b/doc/rbd-showmapped-p.diff @@ -0,0 +1,20 @@ +--- /usr/share/ganeti/2.15/ganeti/storage/bdev.py.orig 2018-09-08 19:22:03.000000000 +0200 ++++ /usr/share/ganeti/2.15/ganeti/storage/bdev.py 2019-04-25 09:16:12.708023721 +0200 +@@ -1020,8 +1020,6 @@ + showmap_cmd = [ + constants.RBD_CMD, + "showmapped", +- "-p", +- pool, + "--format", + "json" + ] +@@ -1036,7 +1034,7 @@ + except RbdShowmappedJsonError: + # For older versions of rbd, we have to parse the plain / text output + # manually. +- showmap_cmd = [constants.RBD_CMD, "showmapped", "-p", pool] ++ showmap_cmd = [constants.RBD_CMD, "showmapped"] + result = utils.RunCmd(showmap_cmd) + if result.failed: + base.ThrowError("rbd showmapped failed (%s): %s", -- 2.20.1