update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / test / librados_test_stub / TestMemCluster.cc

diff --git a/ceph/src/test/librados_test_stub/TestMemCluster.cc b/ceph/src/test/librados_test_stub/TestMemCluster.cc
index 1177ec462ea61f98a5eb53d13982a5d61facde50..f829dd52c4ef421b6a295c6240ceb9e9d311b55a 100644 (file)
--- a/ceph/src/test/librados_test_stub/TestMemCluster.cc
+++ b/ceph/src/test/librados_test_stub/TestMemCluster.cc
@@ -7,12 +7,13 @@
 namespace librados {
 
 TestMemCluster::File::File()
-  : snap_id(), exists(true) {
+  : objver(0), snap_id(), exists(true) {
 }
 
 TestMemCluster::File::File(const File &rhs)
   : data(rhs.data),
     mtime(rhs.mtime),
+    objver(rhs.objver),
     snap_id(rhs.snap_id),
     exists(rhs.exists) {
 }
@@ -164,19 +165,19 @@ void TestMemCluster::allocate_client(uint32_t *nonce, uint64_t *global_id) {
 
 void TestMemCluster::deallocate_client(uint32_t nonce) {
   std::lock_guard locker{m_lock};
-  m_blacklist.erase(nonce);
+  m_blocklist.erase(nonce);
 }
 
-bool TestMemCluster::is_blacklisted(uint32_t nonce) const {
+bool TestMemCluster::is_blocklisted(uint32_t nonce) const {
   std::lock_guard locker{m_lock};
-  return (m_blacklist.find(nonce) != m_blacklist.end());
+  return (m_blocklist.find(nonce) != m_blocklist.end());
 }
 
-void TestMemCluster::blacklist(uint32_t nonce) {
-  m_watch_notify.blacklist(nonce);
+void TestMemCluster::blocklist(uint32_t nonce) {
+  m_watch_notify.blocklist(nonce);
 
   std::lock_guard locker{m_lock};
-  m_blacklist.insert(nonce);
+  m_blocklist.insert(nonce);
 }
 
 void TestMemCluster::transaction_start(const ObjectLocator& locator) {