From: Li Wang Date: Sat, 30 Sep 2017 02:34:17 +0000 (+0000) Subject: librbd: assert(false)->ceph_abort() X-Git-Tag: v13.0.1~675^2~6 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b5ab2c35e2c7717984b95004f059d956fd261e8c;p=ceph.git librbd: assert(false)->ceph_abort() Signed-off-by: Li Wang --- diff --git a/src/librbd/ImageState.cc b/src/librbd/ImageState.cc index 5c2d92a4eed..1f294879027 100644 --- a/src/librbd/ImageState.cc +++ b/src/librbd/ImageState.cc @@ -533,7 +533,7 @@ void ImageState::execute_next_action_unlock() { send_prepare_lock_unlock(); return; } - assert(false); + ceph_abort(); } template diff --git a/src/librbd/ManagedLock.cc b/src/librbd/ManagedLock.cc index f584d6af5fb..d4dfe72d87b 100644 --- a/src/librbd/ManagedLock.cc +++ b/src/librbd/ManagedLock.cc @@ -407,7 +407,7 @@ void ManagedLock::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 b146eeac3a1..6a97f4159e9 100644 --- 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 9f43ebc6a2e..da8bb0942e1 100644 --- 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 aee2f14d7b0..5f01b45e259 100644 --- 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 c497cab7bc6..27d69a50dd3 100644 --- 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 83e80766f00..724690b9331 100644 --- 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 dd0dc1de5cf..42484a6ea52 100644 --- 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 82aaa7d199d..9a4e7a51c97 100644 --- 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 5d77d2630d3..a8b132206e1 100644 --- 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 821dd5b8781..ab88028097c 100644 --- 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 0da4fd4ae8e..6c8b955253d 100644 --- 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 e01dc2bc67b..0a3deccd13e 100644 --- a/src/librbd/operation/FlattenRequest.cc +++ b/src/librbd/operation/FlattenRequest.cc @@ -89,7 +89,7 @@ bool FlattenRequest::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 1e4b854bddd..ad1aaa840ba 100644 --- a/src/librbd/operation/ObjectMapIterate.cc +++ b/src/librbd/operation/ObjectMapIterate.cc @@ -218,7 +218,7 @@ bool ObjectMapIterateRequest::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 ce8ee858b85..d8d0e18c302 100644 --- a/src/librbd/operation/RebuildObjectMapRequest.cc +++ b/src/librbd/operation/RebuildObjectMapRequest.cc @@ -75,7 +75,7 @@ bool RebuildObjectMapRequest::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 cfd54d1d860..1ed49a0e971 100644 --- a/src/librbd/operation/RenameRequest.cc +++ b/src/librbd/operation/RenameRequest.cc @@ -91,7 +91,7 @@ bool RenameRequest::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 4daf9fdfb31..53a174cabd5 100644 --- a/src/librbd/operation/SnapshotRemoveRequest.cc +++ b/src/librbd/operation/SnapshotRemoveRequest.cc @@ -88,7 +88,7 @@ bool SnapshotRemoveRequest::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 369d8e283a1..74cebb28cf3 100644 --- a/src/librbd/operation/SnapshotUnprotectRequest.cc +++ b/src/librbd/operation/SnapshotUnprotectRequest.cc @@ -198,7 +198,7 @@ bool SnapshotUnprotectRequest::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 46ec967b5ed..40617b84071 100644 --- a/src/librbd/operation/TrimRequest.cc +++ b/src/librbd/operation/TrimRequest.cc @@ -172,7 +172,7 @@ bool TrimRequest::should_complete(int r) default: lderr(cct) << "invalid state: " << m_state << dendl; - assert(false); + ceph_abort(); break; } return false;