upgrade

Author: mymeiyi

cloud/src/meta-service/meta_service.cpp

@@ -2323,8 +2323,9 @@ void MetaServiceImpl::get_delete_bitmap_update_lock(google::protobuf::RpcControl
             lock_key_not_found = true;
             std::string current_lock_msg = "lock key not found";
             lock_info.set_lock_id(request->lock_id());
+            // compaction does not use this expiration, only used when upgrade ms
+            lock_info.set_expiration(expiration);
             if (request->lock_id() != COMPACTION_DELETE_BITMAP_LOCK_ID) {
-                lock_info.set_expiration(expiration);
                 lock_info.add_initiators(request->initiator());
             } else {
                 // in normal case, this should remove 0 kvs
@@ -2361,7 +2362,6 @@ void MetaServiceImpl::get_delete_bitmap_update_lock(google::protobuf::RpcControl
                               << " expiration=" << lock_info.expiration() << " now=" << now
                               << " initiator_size=" << lock_info.initiators_size();
                     lock_info.clear_initiators();
-                    lock_info.clear_expiration();
                 } else if (lock_info.lock_id() != request->lock_id()) {
                     ss << "already be locked by lock_id=" << lock_info.lock_id()
                        << " expiration=" << lock_info.expiration() << " now=" << now
@@ -2374,8 +2374,9 @@ void MetaServiceImpl::get_delete_bitmap_update_lock(google::protobuf::RpcControl
                 std::string current_lock_msg =
                         "original lock_id=" + std::to_string(lock_info.lock_id());
                 lock_info.set_lock_id(request->lock_id());
+                // compaction does not use the expiration, only used when upgrade ms
+                lock_info.set_expiration(expiration);
                 if (request->lock_id() != COMPACTION_DELETE_BITMAP_LOCK_ID) {
-                    lock_info.set_expiration(expiration);
                     bool found = false;
                     for (auto initiator : lock_info.initiators()) {
                         if (request->initiator() == initiator) {

cloud/src/meta-service/meta_service_job.cpp

@@ -484,8 +484,8 @@ static bool check_and_remove_delete_bitmap_update_lock(MetaServiceCode& code, st
     }
     if (lock_id == COMPACTION_DELETE_BITMAP_LOCK_ID) {
         // when upgrade ms, prevent old ms get delete bitmap update lock
-        if (lock_info.has_expiration()) {
-            ss << "lock value has expiration=" << lock_info.expiration();
+        if (lock_info.initiators_size() > 0) {
+            ss << "compaction lock has " << lock_info.initiators_size() << " initiators";
             msg = ss.str();
             code = MetaServiceCode::LOCK_EXPIRED;
             return false;

cloud/test/meta_service_test.cpp

@@ -4750,13 +4750,17 @@ TEST(MetaServiceTest, GetDeleteBitmapUpdateLock) {
             reinterpret_cast<::google::protobuf::RpcController*>(&cntl), &req, &res, nullptr);
     ASSERT_EQ(res.status().code(), MetaServiceCode::OK);
 
+    // new compaction get lock again
+    meta_service->get_delete_bitmap_update_lock(
+            reinterpret_cast<::google::protobuf::RpcController*>(&cntl), &req, &res, nullptr);
+    ASSERT_EQ(res.status().code(), MetaServiceCode::OK);
+
     // case 8: lock key owned by compaction, load1 get lock
     req.set_lock_id(888);
     req.set_initiator(-1);
     req.set_expiration(60);
     meta_service->get_delete_bitmap_update_lock(
             reinterpret_cast<::google::protobuf::RpcController*>(&cntl), &req, &res, nullptr);
-    LOG(INFO) << "case 8: " << res.status().msg();
     ASSERT_EQ(res.status().code(), MetaServiceCode::LOCK_CONFLICT);
 
     remove_req.set_lock_id(-1);