librbd: assert(false)->ceph_abort()

Signed-off-by: Li Wang <laurence.liwang@gmail.com>

diff --git a/src/librbd/ImageState.cc b/src/librbd/ImageState.cc
index 5c2d92a4eedc75b124e2f8b3e7b4df69377a2279..1f294879027e9b5bd63a51e1964b82a3a6693be2 100644 (file)
--- a/src/librbd/ImageState.cc
+++ b/src/librbd/ImageState.cc
@@ -533,7 +533,7 @@ void ImageState<I>::execute_next_action_unlock() {
     send_prepare_lock_unlock();
     return;
   }
-  assert(false);
+  ceph_abort();
 }
 
 template <typename I>

diff --git a/src/librbd/ManagedLock.cc b/src/librbd/ManagedLock.cc
index f584d6af5fb5e9518388c087cd9a43be12be83e2..d4dfe72d87b92b1db112d19cec43dbb969a03ab0 100644 (file)
--- a/src/librbd/ManagedLock.cc
+++ b/src/librbd/ManagedLock.cc
@@ -407,7 +407,7 @@ void ManagedLock<I>::execute_next_action() {
     send_shutdown();
     break;
   default:
-    assert(false);
+    ceph_abort();
     break;
   }
 }

diff --git a/src/librbd/WatchNotifyTypes.cc b/src/librbd/WatchNotifyTypes.cc
index b146eeac3a110e4fc09e3f95d535f328e71bd897..6a97f4159e9daa08dea8e22ccc54ddc0b2ec66d3 100644 (file)
--- a/src/librbd/WatchNotifyTypes.cc
+++ b/src/librbd/WatchNotifyTypes.cc
@@ -265,7 +265,7 @@ void UpdateFeaturesPayload::dump(Formatter *f) const {
 }
 
 void UnknownPayload::encode(bufferlist &bl) const {
-  assert(false);
+  ceph_abort();
 }
 
 void UnknownPayload::decode(__u8 version, bufferlist::iterator &iter) {

diff --git a/src/librbd/image/CreateRequest.cc b/src/librbd/image/CreateRequest.cc
index 9f43ebc6a2e607214f3a37bafc2e477285f2972c..da8bb0942e156abcfdc35d98fd43ca94a89f8e3d 100644 (file)
--- a/src/librbd/image/CreateRequest.cc
+++ b/src/librbd/image/CreateRequest.cc
@@ -51,7 +51,7 @@ int validate_features(CephContext *cct, uint64_t features,
       return -EINVAL;
     }
   } else if (force_non_primary) {
-    assert(false);
+    ceph_abort();
   }
 
   return 0;

diff --git a/src/librbd/io/CopyupRequest.cc b/src/librbd/io/CopyupRequest.cc
index aee2f14d7b065ffac28fff1a7df608ce8d1db724..5f01b45e259ffb3c29480d665c5875eb53a476e9 100644 (file)
--- a/src/librbd/io/CopyupRequest.cc
+++ b/src/librbd/io/CopyupRequest.cc
@@ -271,7 +271,7 @@ bool CopyupRequest::should_complete(int r)
 
   default:
     lderr(cct) << "invalid state: " << m_state << dendl;
-    assert(false);
+    ceph_abort();
     break;
   }
   return (r < 0);

diff --git a/src/librbd/journal/DisabledPolicy.h b/src/librbd/journal/DisabledPolicy.h
index c497cab7bc6cfeba95f825022731325ac6395ce9..27d69a50dd37f3eebe5a9dccbde0684b16338d72 100644 (file)
--- a/src/librbd/journal/DisabledPolicy.h
+++ b/src/librbd/journal/DisabledPolicy.h
@@ -21,7 +21,7 @@ public:
     return true;
   }
   void allocate_tag_on_lock(Context *on_finish) override {
-    assert(false);
+    ceph_abort();
   }
 };
 

diff --git a/src/librbd/journal/Types.cc b/src/librbd/journal/Types.cc
index 83e80766f0061aa27f2fc53fd28c73dbce2c1d65..724690b93314103ace25d0d72fccccbe249f345e 100644 (file)
--- a/src/librbd/journal/Types.cc
+++ b/src/librbd/journal/Types.cc
@@ -356,7 +356,7 @@ void MetadataRemoveEvent::dump(Formatter *f) const {
 }
 
 void UnknownEvent::encode(bufferlist& bl) const {
-  assert(false);
+  ceph_abort();
 }
 
 void UnknownEvent::decode(__u8 version, bufferlist::iterator& it) {
@@ -627,7 +627,7 @@ void CliClientMeta::dump(Formatter *f) const {
 }
 
 void UnknownClientMeta::encode(bufferlist& bl) const {
-  assert(false);
+  ceph_abort();
 }
 
 void UnknownClientMeta::decode(__u8 version, bufferlist::iterator& it) {

diff --git a/src/librbd/mirroring_watcher/Types.cc b/src/librbd/mirroring_watcher/Types.cc
index dd0dc1de5cf145e6fafa1b582dad98fcdbe02770..42484a6ea5282657cb54efd76d6e2c9f043cb685 100644 (file)
--- a/src/librbd/mirroring_watcher/Types.cc
+++ b/src/librbd/mirroring_watcher/Types.cc
@@ -65,7 +65,7 @@ void ImageUpdatedPayload::dump(Formatter *f) const {
 }
 
 void UnknownPayload::encode(bufferlist &bl) const {
-  assert(false);
+  ceph_abort();
 }
 
 void UnknownPayload::decode(__u8 version, bufferlist::iterator &iter) {

diff --git a/src/librbd/object_map/Request.cc b/src/librbd/object_map/Request.cc
index 82aaa7d199d644b6873732de870fbb65df80ffa4..9a4e7a51c97b60e847667efddf16d75c682ad47c 100644 (file)
--- a/src/librbd/object_map/Request.cc
+++ b/src/librbd/object_map/Request.cc
@@ -41,7 +41,7 @@ bool Request::should_complete(int r) {
 
   default:
     lderr(cct) << "invalid state: " << m_state << dendl;
-    assert(false);
+    ceph_abort();
     break;
   }
   return false;

diff --git a/src/librbd/object_map/SnapshotCreateRequest.cc b/src/librbd/object_map/SnapshotCreateRequest.cc
index 5d77d2630d385a13bdb4bd375fbc085be91ea4c0..a8b132206e10540b1b4d66c391c289b9afd4832c 100644 (file)
--- a/src/librbd/object_map/SnapshotCreateRequest.cc
+++ b/src/librbd/object_map/SnapshotCreateRequest.cc
@@ -68,7 +68,7 @@ bool SnapshotCreateRequest::should_complete(int r) {
     finished = true;
     break;
   default:
-    assert(false);
+    ceph_abort();
     break;
   }
   return finished;

diff --git a/src/librbd/object_map/SnapshotRemoveRequest.cc b/src/librbd/object_map/SnapshotRemoveRequest.cc
index 821dd5b8781bb6137470c147032c16f3c171cc01..ab88028097ce9598414d986c0ba0127a4ba2a178 100644 (file)
--- a/src/librbd/object_map/SnapshotRemoveRequest.cc
+++ b/src/librbd/object_map/SnapshotRemoveRequest.cc
@@ -104,7 +104,7 @@ bool SnapshotRemoveRequest::should_complete(int r) {
     finished = true;
     break;
   default:
-    assert(false);
+    ceph_abort();
     break;
   }
   return finished;

diff --git a/src/librbd/object_map/SnapshotRollbackRequest.cc b/src/librbd/object_map/SnapshotRollbackRequest.cc
index 0da4fd4ae8e3beb5a1ff11417ea1e39a3b954e34..6c8b955253dd1c10be8a88b72d08f87c8b45d04f 100644 (file)
--- a/src/librbd/object_map/SnapshotRollbackRequest.cc
+++ b/src/librbd/object_map/SnapshotRollbackRequest.cc
@@ -69,7 +69,7 @@ bool SnapshotRollbackRequest::should_complete(int r) {
     finished = Request::should_complete(r);
     break;
   default:
-    assert(false);
+    ceph_abort();
     break;
   }
   return finished;

diff --git a/src/librbd/operation/FlattenRequest.cc b/src/librbd/operation/FlattenRequest.cc
index e01dc2bc67b749658ab7b015169ff02286d06939..0a3deccd13e6001ec17a0eb3705c6222c70e2b8a 100644 (file)
--- a/src/librbd/operation/FlattenRequest.cc
+++ b/src/librbd/operation/FlattenRequest.cc
@@ -89,7 +89,7 @@ bool FlattenRequest<I>::should_complete(int r) {
 
   default:
     lderr(cct) << "invalid state: " << m_state << dendl;
-    assert(false);
+    ceph_abort();
     break;
   }
   return false;

diff --git a/src/librbd/operation/ObjectMapIterate.cc b/src/librbd/operation/ObjectMapIterate.cc
index 1e4b854bddd500f8e0ff7d77427ee42d3c2aab0e..ad1aaa840ba7736db9bef9023ea2ed209e079790 100644 (file)
--- a/src/librbd/operation/ObjectMapIterate.cc
+++ b/src/librbd/operation/ObjectMapIterate.cc
@@ -218,7 +218,7 @@ bool ObjectMapIterateRequest<I>::should_complete(int r) {
     break;
 
   default:
-    assert(false);
+    ceph_abort();
     break;
   }
 

diff --git a/src/librbd/operation/RebuildObjectMapRequest.cc b/src/librbd/operation/RebuildObjectMapRequest.cc
index ce8ee858b850ab025a460bb54229ba50ee25d60d..d8d0e18c3025b188c2b32fa1e3d0e1fda4f94a45 100644 (file)
--- a/src/librbd/operation/RebuildObjectMapRequest.cc
+++ b/src/librbd/operation/RebuildObjectMapRequest.cc
@@ -75,7 +75,7 @@ bool RebuildObjectMapRequest<I>::should_complete(int r) {
     break;
 
   default:
-    assert(false);
+    ceph_abort();
     break;
   }
 

diff --git a/src/librbd/operation/RenameRequest.cc b/src/librbd/operation/RenameRequest.cc
index cfd54d1d860409b24be5fd3033dea8ba33915e68..1ed49a0e971e03b1e1249cc91c29cc0f61dacc9d 100644 (file)
--- a/src/librbd/operation/RenameRequest.cc
+++ b/src/librbd/operation/RenameRequest.cc
@@ -91,7 +91,7 @@ bool RenameRequest<I>::should_complete(int r) {
     send_remove_source_header();
     break;
   default:
-    assert(false);
+    ceph_abort();
     break;
   }
   return false;

diff --git a/src/librbd/operation/SnapshotRemoveRequest.cc b/src/librbd/operation/SnapshotRemoveRequest.cc
index 4daf9fdfb312a6e20c85ecc923859ea6ecabb12a..53a174cabd58ee1dcc4762a51010c91faa42282f 100644 (file)
--- a/src/librbd/operation/SnapshotRemoveRequest.cc
+++ b/src/librbd/operation/SnapshotRemoveRequest.cc
@@ -88,7 +88,7 @@ bool SnapshotRemoveRequest<I>::should_complete(int r) {
     finished = true;
     break;
   default:
-    assert(false);
+    ceph_abort();
     break;
   }
 

diff --git a/src/librbd/operation/SnapshotUnprotectRequest.cc b/src/librbd/operation/SnapshotUnprotectRequest.cc
index 369d8e283a140e58bf372385a35a818013853a8c..74cebb28cf3a580a44a5eaf157132918ab40cee7 100644 (file)
--- a/src/librbd/operation/SnapshotUnprotectRequest.cc
+++ b/src/librbd/operation/SnapshotUnprotectRequest.cc
@@ -198,7 +198,7 @@ bool SnapshotUnprotectRequest<I>::should_complete(int r) {
     finished = true;
     break;
   default:
-    assert(false);
+    ceph_abort();
     break;
   }
   return finished;

diff --git a/src/librbd/operation/TrimRequest.cc b/src/librbd/operation/TrimRequest.cc
index 46ec967b5eddcb3bf8d6aa0db32ce42e82516a3c..40617b84071feb6cd66db1abcdbfe7019f99cd8f 100644 (file)
--- a/src/librbd/operation/TrimRequest.cc
+++ b/src/librbd/operation/TrimRequest.cc
@@ -172,7 +172,7 @@ bool TrimRequest<I>::should_complete(int r)
 
   default:
     lderr(cct) << "invalid state: " << m_state << dendl;
-    assert(false);
+    ceph_abort();
     break;
   }
   return false;