jan comments

arangodb · KVS85 · Sep 28, 2021 · Jul 22, 2021 · Jul 28, 2021 · Aug 10, 2021
commit 24f349b3e5e0a711a56ab6e66bcea77ba16428a3
diff --git a/arangod/Cluster/ServerState.cpp b/arangod/Cluster/ServerState.cpp
@@ -328,6 +328,7 @@ bool ServerState::readOnly() {
 
 /// @brief set server read-only
 bool ServerState::setReadOnly(ReadOnlyMode ro) {
+  auto ret = readOnly();
   if(ro == API_FALSE) {
     _serverstate_readonly.exchange(false, std::memory_order_release);
   } else if (ro == API_TRUE) {
@@ -337,8 +338,7 @@ bool ServerState::setReadOnly(ReadOnlyMode ro) {
   } else if (ro == LICENSE_TRUE) {
     _license_readonly.exchange(true, std::memory_order_release);
   }
-  return _serverstate_readonly.load(std::memory_order_acquire) ||
-    _license_readonly.load(std::memory_order_acquire);
+  return ret;
 }
 
 // ============ Instance methods =================
@@ -380,7 +380,7 @@ bool ServerState::logoff(double timeout) {
 
   AgencyWriteTransaction unregisterTransaction(operations);
   AgencyComm comm(_server);
-  
+
   // Try only once to unregister because maybe the agencycomm
   // is shutting down as well...
   int maxTries = static_cast<int>(timeout / 3.0);;
@@ -552,7 +552,7 @@ std::string ServerState::roleToAgencyKey(ServerState::RoleEnum role) {
       return "Coordinator";
     case ROLE_SINGLE:
       return "Single";
-    case ROLE_AGENT: 
+    case ROLE_AGENT:
       return "Agent";
     case ROLE_UNDEFINED: {
       return "Undefined";
@@ -1058,9 +1058,9 @@ bool ServerState::isFoxxmaster() const {
   return /*!isRunningInCluster() ||*/ _foxxmaster == getId();
 }
 
-std::string ServerState::getFoxxmaster() const { 
+std::string ServerState::getFoxxmaster() const {
   READ_LOCKER(readLocker, _foxxmasterLock);
-  return _foxxmaster; 
+  return _foxxmaster;
 }
 
 void ServerState::setFoxxmaster(std::string const& foxxmaster) {

diff --git a/arangod/Cluster/ServerState.h b/arangod/Cluster/ServerState.h
@@ -50,7 +50,7 @@ class ServerState {
   };
 
   /// @brief an enum describing the possible states a server can have
-  enum StateEnum {
+  enum class StateEnum {
     STATE_UNDEFINED = 0,  // initial value
     STATE_STARTUP,        // used by all roles
     STATE_SERVING,        // used by all roles

diff --git a/js/common/bootstrap/errors.js b/js/common/bootstrap/errors.js
@@ -365,7 +365,7 @@
     "ERROR_AIR_EXECUTION_ERROR"    : { "code" : 8001, "message" : "error during AIR execution" },
     "ERROR_LICENSE_EXPIRED_OR_INVALID" : { "code" : 9001, "message" : "license has expired or is invalid" },
     "ERROR_LICENSE_SIGNATURE_VERIFICATION" : { "code" : 9002, "message" : "license verification failed" },
-    "ERROR_LICENSE_NON_MATHICHING_ID" : { "code" : 9003, "message" : "non matching license id" },
+    "ERROR_LICENSE_NON_MATCHING_ID" : { "code" : 9003, "message" : "non-matching license id" },
     "ERROR_LICENSE_FEATURE_NOT_ENABLED" : { "code" : 9004, "message" : "feature is not enabled by the license" },
     "ERROR_LICENSE_RESOURCE_EXHAUSTED" : { "code" : 9005, "message" : "the resource is exhausted" },
     "ERROR_LICENSE_INVALID"        : { "code" : 9006, "message" : "invalid license" },

diff --git a/lib/Basics/error-registry.h b/lib/Basics/error-registry.h
@@ -733,8 +733,8 @@ constexpr static frozen::unordered_map<ErrorCode, const char*, 362> ErrorMessage
       "license has expired or is invalid"},
     {TRI_ERROR_LICENSE_SIGNATURE_VERIFICATION,  // 9002
       "license verification failed"},
-    {TRI_ERROR_LICENSE_NON_MATHICHING_ID,  // 9003
-      "non matching license id"},
+    {TRI_ERROR_LICENSE_NON_MATCHING_ID,  // 9003
+      "non-matching license id"},
     {TRI_ERROR_LICENSE_FEATURE_NOT_ENABLED,  // 9004
       "feature is not enabled by the license"},
     {TRI_ERROR_LICENSE_RESOURCE_EXHAUSTED,  // 9005

diff --git a/lib/Basics/voc-errors.h b/lib/Basics/voc-errors.h
@@ -1924,13 +1924,13 @@ constexpr auto TRI_ERROR_LICENSE_EXPIRED_OR_INVALID
 
 /// 9002: ERROR_LICENSE_SIGNATURE_VERIFICATION
 /// "license verification failed"
-/// Verfication of license failed.
+/// Verification of license failed.
 constexpr auto TRI_ERROR_LICENSE_SIGNATURE_VERIFICATION                          = ErrorCode{9002};
 
-/// 9003: ERROR_LICENSE_NON_MATHICHING_ID
-/// "non matching license id"
+/// 9003: ERROR_LICENSE_NON_MATCHING_ID
+/// "non-matching license id"
 /// The ID of the license does not match the ID of this instance.
-constexpr auto TRI_ERROR_LICENSE_NON_MATHICHING_ID                               = ErrorCode{9003};
+constexpr auto TRI_ERROR_LICENSE_NON_MATCHING_ID                                 = ErrorCode{9003};
 
 /// 9004: ERROR_LICENSE_FEATURE_NOT_ENABLED
 /// "feature is not enabled by the license"