addressed review comments from Wangchong

Kong · Jan 13, 2022 · c8e03f9 · c8e03f9
1 parent 5519927
commit c8e03f9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/kong/api/routes/config.lua b/kong/api/routes/config.lua
@@ -118,7 +118,7 @@ return {
           })
         end
 
-        if err:find("MDB_MAP_FULL", nil, true) then
+        if err == "map full" then
           kong.log.err("not enough space for declarative config")
           return kong.response.exit(413, {
             message = "Configuration does not fit in LMDB database, " ..

diff --git a/kong/clustering/data_plane.lua b/kong/clustering/data_plane.lua
@@ -186,10 +186,6 @@ local function send_ping(c, log_suffix)
 
   local hash = declarative.get_current_hash()
 
-  if hash == "true" then
-    hash = string.rep("0", 32)
-  end
-
   local _, err = c:send_ping(hash)
   if err then
     ngx_log(is_timeout(err) and ngx_NOTICE or ngx_WARN, _log_prefix,

diff --git a/kong/db/declarative/init.lua b/kong/db/declarative/init.lua
@@ -816,7 +816,7 @@ function declarative.load_into_cache(entities, meta, hash)
 
   t:set("tags||@list", tags)
 
-  hash = hash or "true"
+  hash = hash or string.rep("0", 32)
   t:set(DECLARATIVE_HASH_KEY, hash)
 
   kong.default_workspace = default_workspace
@@ -846,6 +846,9 @@ do
         return nil, "failed to broadcast reconfigure event: " .. (err or ok)
       end
 
+    elseif err:find("MDB_MAP_FULL", nil, true) then
+      return nil, "map full"
+
     else
       return nil, err
     end