X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ceph%2Fsrc%2FSimpleRADOSStriper.cc;h=3a64193d3e41c6684da4a79e5111e4eb5d61231b;hb=20effc670b57271cb089376d6d0800990e5218d5;hp=d6fe101f9e9e36f86790256d367225476498e6da;hpb=a71831dadd1e1f3e0fa70405511f65cc33db0498;p=ceph.git diff --git a/ceph/src/SimpleRADOSStriper.cc b/ceph/src/SimpleRADOSStriper.cc index d6fe101f9..3a64193d3 100644 --- a/ceph/src/SimpleRADOSStriper.cc +++ b/ceph/src/SimpleRADOSStriper.cc @@ -618,7 +618,7 @@ int SimpleRADOSStriper::recover_lock() entity_addrvec_t addrv; addrv.parse(addrs.c_str()); auto R = librados::Rados(ioctx); - auto b = "blocklist"sv; + std::string_view b = "blocklist"; retry: for (auto& a : addrv.v) { CachedStackStringStream css; @@ -630,8 +630,8 @@ retry: d(5) << "sending blocklist command: " << cmd << dendl; std::string out; if (int rc = R.mon_command(css->str(), bufferlist(), nullptr, &out); rc < 0) { - if (rc == -EINVAL && b == "blocklist"sv) { - b = "blacklist"sv; + if (rc == -EINVAL && b == "blocklist") { + b = "blacklist"; goto retry; } d(-1) << "Cannot proceed with recovery because I have failed to blocklist the old client: " << cpp_strerror(rc) << ", out = " << out << dendl;