Merge pull request #23823 from dillaman/wip-namespace-osd-check

librbd: prevent use of namespaces on pre-nautilus OSDs

Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>

diff --cc src/include/rados/librados.h
Simple merge

diff --cc src/include/rados/librados.hpp
Simple merge

diff --cc src/librados/RadosClient.cc
Simple merge

diff --cc src/librados/RadosClient.h
Simple merge

diff --cc src/librados/librados.cc
Simple merge

diff --cc src/librbd/api/Namespace.cc
Simple merge

diff --cc src/test/librados_test_stub/LibradosTestStub.cc
Simple merge

diff --cc src/test/librados_test_stub/MockTestMemRadosClient.h
index 92ad65733e792053eac39d36dc33b7febe3c840a,c22845c1da8a83181fa9ddddebe680736cba7924..63050cb1ed2cdae32b867efb2d04d7641f284e4c
--- 1/src/test/librados_test_stub/MockTestMemRadosClient.h
--- 2/src/test/librados_test_stub/MockTestMemRadosClient.h
+++ b/src/test/librados_test_stub/MockTestMemRadosClient.h
@@@ -68,9 -68,9 +73,10 @@@ public
    void default_to_dispatch() {
      using namespace ::testing;
  
 +    ON_CALL(*this, connect()).WillByDefault(Invoke(this, &MockTestMemRadosClient::do_connect));
      ON_CALL(*this, create_ioctx(_, _)).WillByDefault(Invoke(this, &MockTestMemRadosClient::do_create_ioctx));
      ON_CALL(*this, blacklist_add(_, _)).WillByDefault(Invoke(this, &MockTestMemRadosClient::do_blacklist_add));
+     ON_CALL(*this, get_min_compatible_osd(_)).WillByDefault(Invoke(this, &MockTestMemRadosClient::do_get_min_compatible_osd));
      ON_CALL(*this, get_min_compatible_client(_, _)).WillByDefault(Invoke(this, &MockTestMemRadosClient::do_get_min_compatible_client));
      ON_CALL(*this, service_daemon_register(_, _, _)).WillByDefault(Invoke(this, &MockTestMemRadosClient::do_service_daemon_register));
      ON_CALL(*this, service_daemon_update_status_r(_)).WillByDefault(Invoke(this, &MockTestMemRadosClient::do_service_daemon_update_status_r));

diff --cc src/test/librados_test_stub/TestMemRadosClient.h
Simple merge