From 5d7e612ea6a987fa2f42f90aaa34eca066a356fc Mon Sep 17 00:00:00 2001 From: Li Wang Date: Sat, 30 Sep 2017 02:36:34 +0000 Subject: [PATCH] tools: assert(false)->ceph_abort() Signed-off-by: Li Wang --- src/tools/rbd/Utils.cc | 2 +- src/tools/rbd_mirror/image_sync/ObjectCopyRequest.cc | 2 +- src/tools/rbd_mirror/instance_watcher/Types.cc | 2 +- src/tools/rbd_mirror/leader_watcher/Types.cc | 2 +- src/tools/rbd_nbd/rbd-nbd.cc | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/tools/rbd/Utils.cc b/src/tools/rbd/Utils.cc index a674e0cab9e28..d3c2bb13a5308 100644 --- a/src/tools/rbd/Utils.cc +++ b/src/tools/rbd/Utils.cc @@ -104,7 +104,7 @@ int extract_spec(const std::string &spec, std::string *pool_name, pattern = "^(?:([^/]+)/)?([^@]+)(?:@(.+))?$"; break; default: - assert(false); + ceph_abort(); break; } diff --git a/src/tools/rbd_mirror/image_sync/ObjectCopyRequest.cc b/src/tools/rbd_mirror/image_sync/ObjectCopyRequest.cc index cc59030878ba3..ab9dd8da76c3c 100644 --- a/src/tools/rbd_mirror/image_sync/ObjectCopyRequest.cc +++ b/src/tools/rbd_mirror/image_sync/ObjectCopyRequest.cc @@ -278,7 +278,7 @@ void ObjectCopyRequest::send_write_object() { op.remove(); break; default: - assert(false); + ceph_abort(); } } diff --git a/src/tools/rbd_mirror/instance_watcher/Types.cc b/src/tools/rbd_mirror/instance_watcher/Types.cc index 69b84e1580ddc..cdf3e26ad7702 100644 --- a/src/tools/rbd_mirror/instance_watcher/Types.cc +++ b/src/tools/rbd_mirror/instance_watcher/Types.cc @@ -119,7 +119,7 @@ void SyncPayloadBase::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/tools/rbd_mirror/leader_watcher/Types.cc b/src/tools/rbd_mirror/leader_watcher/Types.cc index 06939443edc0f..d2460bc0878e3 100644 --- a/src/tools/rbd_mirror/leader_watcher/Types.cc +++ b/src/tools/rbd_mirror/leader_watcher/Types.cc @@ -86,7 +86,7 @@ void LockReleasedPayload::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/tools/rbd_nbd/rbd-nbd.cc b/src/tools/rbd_nbd/rbd-nbd.cc index f81d732ca8cee..5597c3596a139 100644 --- a/src/tools/rbd_nbd/rbd-nbd.cc +++ b/src/tools/rbd_nbd/rbd-nbd.cc @@ -1033,7 +1033,7 @@ static int rbd_nbd(int argc, const char *argv[]) r = parse_args(args, &err_msg, &cfg); if (r == HELP_INFO) { usage(); - assert(false); + ceph_abort(); } else if (r == VERSION_INFO) { std::cout << pretty_version_to_str() << std::endl; return 0; @@ -1066,7 +1066,7 @@ static int rbd_nbd(int argc, const char *argv[]) break; default: usage(); - assert(false); + ceph_abort(); break; } -- 2.39.5