increase heartbeat lock to avoid blocking

vesoft-inc · Feb 24, 2022 · 8ef4b4b · 8ef4b4b
1 parent 1d98cbd
commit 8ef4b4b
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 5 deletions.
diff --git a/src/meta/processors/Common.h b/src/meta/processors/Common.h
@@ -19,6 +19,16 @@ class LockUtils {
  static folly::SharedMutex lock;
  return lock;
  }
+
+ static folly::SharedMutex& heartbeatLock() {
+ static folly::SharedMutex heartbeatLock;
+ return heartbeatLock;
+ }
+
+ static folly::SharedMutex& snapshotLock() {
+ static folly::SharedMutex snapshotLock;
+ return snapshotLock;
+ }
 };
 
 } // namespace meta

diff --git a/src/meta/processors/admin/AgentHBProcessor.cpp b/src/meta/processors/admin/AgentHBProcessor.cpp
@@ -28,7 +28,7 @@ void AgentHBProcessor::process(const cpp2::AgentHBReq& req) {
  HostAddr agentAddr((*req.host_ref()).host, (*req.host_ref()).port);
  LOG(INFO) << "Receive heartbeat from " << agentAddr << ", role = AGENT";
 
- folly::SharedMutex::WriteHolder holder(LockUtils::lock());
+ folly::SharedMutex::WriteHolder holder(LockUtils::heartbeatLock());
  nebula::cpp2::ErrorCode ret = nebula::cpp2::ErrorCode::SUCCEEDED;
  do {
  // update agent host info

diff --git a/src/meta/processors/admin/CreateBackupProcessor.cpp b/src/meta/processors/admin/CreateBackupProcessor.cpp
@@ -97,7 +97,7 @@ void CreateBackupProcessor::process(const cpp2::CreateBackupReq& req) {
  return;
  }
 
- folly::SharedMutex::WriteHolder holder(LockUtils::lock());
+ folly::SharedMutex::WriteHolder holder(LockUtils::snapshotLock());
  // get active storage host list
  auto activeHostsRet = ActiveHostsMan::getActiveHosts(kvstore_);
  if (!nebula::ok(activeHostsRet)) {

diff --git a/src/meta/processors/admin/CreateSnapshotProcessor.cpp b/src/meta/processors/admin/CreateSnapshotProcessor.cpp
@@ -31,7 +31,7 @@ void CreateSnapshotProcessor::process(const cpp2::CreateSnapshotReq&) {
  }
 
  auto snapshot = folly::sformat("SNAPSHOT_{}", MetaKeyUtils::genTimestampStr());
- folly::SharedMutex::WriteHolder holder(LockUtils::lock());
+ folly::SharedMutex::WriteHolder holder(LockUtils::snapshotLock());
 
  auto activeHostsRet = ActiveHostsMan::getActiveHosts(kvstore_);
  if (!nebula::ok(activeHostsRet)) {

diff --git a/src/meta/processors/admin/DropSnapshotProcessor.cpp b/src/meta/processors/admin/DropSnapshotProcessor.cpp
@@ -13,7 +13,7 @@ namespace meta {
 
 void DropSnapshotProcessor::process(const cpp2::DropSnapshotReq& req) {
  auto& snapshot = req.get_name();
- folly::SharedMutex::WriteHolder holder(LockUtils::lock());
+ folly::SharedMutex::WriteHolder holder(LockUtils::snapshotLock());
 
  // Check snapshot is exists
  auto key = MetaKeyUtils::snapshotKey(snapshot);

diff --git a/src/meta/processors/admin/HBProcessor.cpp b/src/meta/processors/admin/HBProcessor.cpp
@@ -32,7 +32,7 @@ void HBProcessor::process(const cpp2::HBReq& req) {
  auto role = req.get_role();
  LOG(INFO) << "Receive heartbeat from " << host
  << ", role = " << apache::thrift::util::enumNameSafe(role);
- folly::SharedMutex::WriteHolder holder(LockUtils::lock());
+ folly::SharedMutex::WriteHolder holder(LockUtils::heartbeatLock());
  if (role == cpp2::HostRole::STORAGE) {
  if (!ActiveHostsMan::machineRegisted(kvstore_, host)) {
  LOG(INFO) << "Machine " << host << " is not registed";

diff --git a/src/meta/processors/index/CreateEdgeIndexProcessor.cpp b/src/meta/processors/index/CreateEdgeIndexProcessor.cpp
@@ -36,6 +36,7 @@ void CreateEdgeIndexProcessor::process(const cpp2::CreateEdgeIndexReq& req) {
  return;
  }
 
+ folly::SharedMutex::ReadHolder rHolder(LockUtils::snapshotLock());
  folly::SharedMutex::WriteHolder holder(LockUtils::lock());
  auto ret = getIndexID(space, indexName);
  if (nebula::ok(ret)) {

diff --git a/src/meta/processors/index/CreateTagIndexProcessor.cpp b/src/meta/processors/index/CreateTagIndexProcessor.cpp
@@ -36,6 +36,7 @@ void CreateTagIndexProcessor::process(const cpp2::CreateTagIndexReq& req) {
  return;
  }
 
+ folly::SharedMutex::ReadHolder rHolder(LockUtils::snapshotLock());
  folly::SharedMutex::WriteHolder holder(LockUtils::lock());
  auto ret = getIndexID(space, indexName);
  if (nebula::ok(ret)) {

diff --git a/src/meta/processors/parts/DropSpaceProcessor.cpp b/src/meta/processors/parts/DropSpaceProcessor.cpp
@@ -9,6 +9,7 @@ namespace nebula {
 namespace meta {
 
 void DropSpaceProcessor::process(const cpp2::DropSpaceReq& req) {
+ folly::SharedMutex::ReadHolder rHolder(LockUtils::snapshotLock());
  folly::SharedMutex::WriteHolder holder(LockUtils::lock());
  const auto& spaceName = req.get_space_name();
  auto spaceRet = getSpaceId(spaceName);

diff --git a/src/meta/processors/schema/AlterEdgeProcessor.cpp b/src/meta/processors/schema/AlterEdgeProcessor.cpp
@@ -15,6 +15,7 @@ void AlterEdgeProcessor::process(const cpp2::AlterEdgeReq& req) {
  CHECK_SPACE_ID_AND_RETURN(spaceId);
  const auto& edgeName = req.get_edge_name();
 
+ folly::SharedMutex::ReadHolder rHolder(LockUtils::snapshotLock());
  folly::SharedMutex::WriteHolder holder(LockUtils::lock());
  auto ret = getEdgeType(spaceId, edgeName);
  if (!nebula::ok(ret)) {

diff --git a/src/meta/processors/schema/AlterTagProcessor.cpp b/src/meta/processors/schema/AlterTagProcessor.cpp
@@ -15,6 +15,7 @@ void AlterTagProcessor::process(const cpp2::AlterTagReq& req) {
  CHECK_SPACE_ID_AND_RETURN(spaceId);
  const auto& tagName = req.get_tag_name();
 
+ folly::SharedMutex::ReadHolder rHolder(LockUtils::snapshotLock());
  folly::SharedMutex::WriteHolder holder(LockUtils::lock());
  auto ret = getTagId(spaceId, tagName);
  if (!nebula::ok(ret)) {

diff --git a/src/meta/processors/schema/DropEdgeProcessor.cpp b/src/meta/processors/schema/DropEdgeProcessor.cpp
@@ -12,6 +12,7 @@ void DropEdgeProcessor::process(const cpp2::DropEdgeReq& req) {
  GraphSpaceID spaceId = req.get_space_id();
  CHECK_SPACE_ID_AND_RETURN(spaceId);
 
+ folly::SharedMutex::ReadHolder rHolder(LockUtils::snapshotLock());
  folly::SharedMutex::WriteHolder holder(LockUtils::lock());
  const auto& edgeName = req.get_edge_name();
 

diff --git a/src/meta/processors/schema/DropTagProcessor.cpp b/src/meta/processors/schema/DropTagProcessor.cpp
@@ -12,6 +12,7 @@ void DropTagProcessor::process(const cpp2::DropTagReq& req) {
  GraphSpaceID spaceId = req.get_space_id();
  CHECK_SPACE_ID_AND_RETURN(spaceId);
 
+ folly::SharedMutex::ReadHolder rHolder(LockUtils::snapshotLock());
  folly::SharedMutex::WriteHolder holder(LockUtils::lock());
  const auto& tagName = req.get_tag_name();