chore: address comments

Signed-off-by: Roman Gershman <[email protected]>
dragonflydb · Mar 12, 2024 · df0ea30 · df0ea30
1 parent ffa36eb
commit df0ea30
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/server/db_slice.cc b/src/server/db_slice.cc
@@ -1072,7 +1072,11 @@ void DbSlice::PostUpdate(DbIndex db_ind, PrimeIterator it, std::string_view key,
 }
 
 DbSlice::ItAndExp DbSlice::ExpireIfNeeded(const Context& cntx, PrimeIterator it) {
-  DCHECK(it->second.HasExpire());
+  if (!it->second.HasExpire()) {
+    LOG(ERROR) << "Invalid call to ExpireIfNeeded";
+    return {it, ExpireIterator{}};
+  }
+
   auto& db = db_arr_[cntx.db_index];
 
   auto expire_it = db->expire.Find(it->first);

diff --git a/src/server/debugcmd.cc b/src/server/debugcmd.cc
@@ -531,6 +531,10 @@ void DebugCmd::Replica(CmdArgList args) {
 }
 
 void DebugCmd::Load(string_view filename) {
+  if (!ServerState::tlocal()->is_master) {
+    return cntx_->SendError("Replica cannot load data");
+  }
+
   auto new_state = sf_.service().SwitchState(GlobalState::ACTIVE, GlobalState::LOADING);
   if (new_state.first != GlobalState::LOADING) {
     LOG(WARNING) << GlobalStateName(new_state.first) << " in progress, ignored";