From: Jason Dillaman <dillaman@redhat.com>
Date: Thu, 20 Sep 2018 12:07:21 +0000 (-0400)
Subject: Merge pull request #23823 from dillaman/wip-namespace-osd-check
X-Git-Tag: v14.0.1~234
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=98e5354d95be1de099aeb3cf9286a6478d289608;p=ceph.git

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>
---

98e5354d95be1de099aeb3cf9286a6478d289608
diff --cc src/test/librados_test_stub/MockTestMemRadosClient.h
index 92ad65733e792,c22845c1da8a8..63050cb1ed2cd
--- a/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));