Merge pull request ceph#63374 from Matan-B/wip-matanb-use-ceph-assert

osd, os, mon: s/assert/ceph_assert/g'

Author: SrinivasaBharath

src/mon/ElectionLogic.cc

@@ -86,7 +86,7 @@ void ElectionLogic::bump_epoch(epoch_t e)
 
 void ElectionLogic::declare_standalone_victory()
 {
-  assert(elector->paxos_size() == 1 && elector->get_my_rank() == 0);
+  ceph_assert(elector->paxos_size() == 1 && elector->get_my_rank() == 0);
   init();
   bump_epoch(epoch+1);
 }

src/mon/LogMonitor.cc

@@ -465,7 +465,7 @@ void LogMonitor::log_external_backlog()
     } else {
       // pre-quincy, we assumed that anything through summary.version was
       // logged externally.
-      assert(r == -ENOENT);
+      ceph_assert(r == -ENOENT);
       external_log_to = summary.version;
       dout(10) << __func__ << " initialized external_log_to = " << external_log_to
 	       << " (summary v " << summary.version << ")" << dendl;

src/mon/MgrMonitor.cc

@@ -725,7 +725,7 @@ void MgrMonitor::on_active()
     return;
   }
   mon.clog->debug() << "mgrmap e" << map.epoch << ": " << map;
-  assert(HAVE_FEATURE(mon.get_quorum_con_features(), SERVER_NAUTILUS));
+  ceph_assert(HAVE_FEATURE(mon.get_quorum_con_features(), SERVER_NAUTILUS));
   if (pending_map.always_on_modules == always_on_modules()) {
     return;
   }

src/mon/MonClient.cc

@@ -1861,7 +1861,7 @@ int MonConnection::handle_auth_bad_method(
   auth_registry->get_supported_methods(con->get_peer_type(), &auth_supported);
   auto p = std::find(auth_supported.begin(), auth_supported.end(),
 		     old_auth_method);
-  assert(p != auth_supported.end());
+  ceph_assert(p != auth_supported.end());
   p = std::find_first_of(std::next(p), auth_supported.end(),
 			 allowed_methods.begin(), allowed_methods.end());
   if (p == auth_supported.end()) {

src/mon/Monitor.cc

@@ -6507,7 +6507,7 @@ int Monitor::handle_auth_request(
 	dout(1) << __func__ << " invalid mode " << (int)mode << dendl;
 	return -EACCES;
       }
-      assert(mode >= AUTH_MODE_MON && mode <= AUTH_MODE_MON_MAX);
+      ceph_assert(mode >= AUTH_MODE_MON && mode <= AUTH_MODE_MON_MAX);
       decode(entity_name, p);
       decode(con->peer_global_id, p);
     } catch (ceph::buffer::error& e) {
@@ -6639,7 +6639,7 @@ bool Monitor::ms_handle_fast_authentication(Connection *con)
       entity_name_t(con->get_peer_type(), -1),  // we don't know yet
       con->get_peer_addrs(),
       con);
-    assert(s);
+    ceph_assert(s);
     dout(10) << __func__ << " adding session " << s << " to con " << con
 	     << dendl;
     con->set_priv(s);

src/mon/OSDMonitor.cc

@@ -7796,8 +7796,8 @@ int OSDMonitor::prepare_pool_size(const unsigned pool_type,
 	*min_size =
 	  erasure_code->get_data_chunk_count() +
 	  std::min<int>(1, erasure_code->get_coding_chunk_count() - 1);
-	assert(*min_size <= *size);
-	assert(*min_size >= erasure_code->get_data_chunk_count());
+	ceph_assert(*min_size <= *size);
+	ceph_assert(*min_size >= erasure_code->get_data_chunk_count());
       }
     }
     break;
@@ -8679,7 +8679,7 @@ int OSDMonitor::prepare_command_pool_set(const cmdmap_t& cmdmap,
     }
     if (osdmap.require_osd_release < ceph_release_t::nautilus) {
       // pre-nautilus osdmap format; increase pg_num directly
-      assert(n > (int)p.get_pg_num());
+      ceph_assert(n > (int)p.get_pg_num());
       // force pre-nautilus clients to resend their ops, since they
       // don't understand pg_num_target changes form a new interval
       p.last_force_op_resend_prenautilus = pending_inc.epoch;

src/mon/PGMap.cc

@@ -57,7 +57,7 @@ void PGMapDigest::encode(bufferlist& bl, uint64_t features) const
 {
   // NOTE: see PGMap::encode_digest
   uint8_t v = 5;
-  assert(HAVE_FEATURE(features, SERVER_NAUTILUS));
+  ceph_assert(HAVE_FEATURE(features, SERVER_NAUTILUS));
   ENCODE_START(v, 1, bl);
   encode(num_pg, bl);
   encode(num_pg_active, bl);
@@ -84,7 +84,7 @@ void PGMapDigest::encode(bufferlist& bl, uint64_t features) const
 void PGMapDigest::decode(bufferlist::const_iterator& p)
 {
   DECODE_START(5, p);
-  assert(struct_v >= 4);
+  ceph_assert(struct_v >= 4);
   decode(num_pg, p);
   decode(num_pg_active, p);
   decode(num_pg_unknown, p);

src/mon/Paxos.cc

@@ -979,7 +979,7 @@ void Paxos::handle_commit(MonOpRequestRef op)
 void Paxos::extend_lease()
 {
   ceph_assert(mon.is_leader());
-  //assert(is_active());
+  //ceph_assert(is_active());
 
   lease_expire = ceph::real_clock::now();
   lease_expire += ceph::make_timespan(g_conf()->mon_lease);

src/os/bluestore/BitmapFreelistManager.cc

@@ -116,7 +116,7 @@ int BitmapFreelistManager::create(uint64_t new_size, uint64_t granularity,
 
 int BitmapFreelistManager::_expand(uint64_t old_size, KeyValueDB* db)
 {
-  assert(old_size < size);
+  ceph_assert(old_size < size);
   ceph_assert(std::has_single_bit(bytes_per_block));
 
   KeyValueDB::Transaction txn;

src/os/bluestore/BlueFS.cc

@@ -1208,7 +1208,7 @@ int BlueFS::prepare_new_device(int id, const bluefs_layout_t& layout)
       REMOVE_WAL,
       layout);
   } else {
-    assert(false);
+    ceph_assert(false);
   }
   return 0;
 }
@@ -1411,7 +1411,7 @@ int BlueFS::_replay(bool noop, bool to_stdout)
       if (r != (int)super.block_size && cct->_conf->bluefs_replay_recovery) {
 	r += _do_replay_recovery_read(log_reader, pos, read_pos + r, super.block_size - r, &bl);
       }
-      assert(r == (int)super.block_size);
+      ceph_assert(r == (int)super.block_size);
       read_pos += r;
     }
     uint64_t more = 0;
@@ -1948,7 +1948,7 @@ int BlueFS::device_migrate_to_existing(
 
   dout(10) << __func__ << " devs_source " << devs_source
 	   << " dev_target " << dev_target << dendl;
-  assert(dev_target < (int)MAX_BDEV);
+  ceph_assert(dev_target < (int)MAX_BDEV);
 
   int flags = 0;
   flags |= devs_source.count(BDEV_DB) ?
@@ -2093,7 +2093,7 @@ int BlueFS::device_migrate_to_new(
 
   dout(10) << __func__ << " devs_source " << devs_source
 	   << " dev_target " << dev_target << dendl;
-  assert(dev_target == (int)BDEV_NEWDB || dev_target == (int)BDEV_NEWWAL);
+  ceph_assert(dev_target == (int)BDEV_NEWDB || dev_target == (int)BDEV_NEWWAL);
 
   int flags = 0;