From: Li Wang <laurence.liwang@gmail.com>
Date: Sat, 30 Sep 2017 02:36:34 +0000 (+0000)
Subject: tools: assert(false)->ceph_abort()
X-Git-Tag: v13.0.1~675^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F18072%2Fhead;p=ceph.git

tools: assert(false)->ceph_abort()

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

diff --git a/src/tools/rbd/Utils.cc b/src/tools/rbd/Utils.cc
index a674e0cab9e2..d3c2bb13a530 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 cc59030878ba..ab9dd8da76c3 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<I>::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 69b84e1580dd..cdf3e26ad770 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 06939443edc0..d2460bc0878e 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 f81d732ca8ce..5597c3596a13 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;
   }