This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.4
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.4 by this push:
new 808249182d7 HBASE-28212 Addendum fix TestShell (#5555)
808249182d7 is described below
commit 808249182d760cc7365f527e70cef212faac3a23
Author: Duo Zhang <zhang...@apache.org>
AuthorDate: Fri Dec 1 23:31:33 2023 +0800
HBASE-28212 Addendum fix TestShell (#5555)
We added a new field in Procedure so the json output is also changed
thus we need to change the assertion
(cherry picked from commit 7dd4d0c532a0d4e60037c193b2ce22f0b03ca01e)
---
hbase-shell/src/test/ruby/shell/list_locks_test.rb | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/hbase-shell/src/test/ruby/shell/list_locks_test.rb
b/hbase-shell/src/test/ruby/shell/list_locks_test.rb
index 100c145a3ac..7013b65e0f9 100644
--- a/hbase-shell/src/test/ruby/shell/list_locks_test.rb
+++ b/hbase-shell/src/test/ruby/shell/list_locks_test.rb
@@ -81,7 +81,8 @@ module Hbase
"\"className\"=>\"org.apache.hadoop.hbase.master.locking.LockProcedure\", " \
"\"procId\"=>\"0\", \"submittedTime\"=>\"0\",
\"state\"=>\"RUNNABLE\", " \
"\"lastUpdate\"=>\"0\", " \
- "\"stateMessage\"=>[{\"lockType\"=>\"EXCLUSIVE\",
\"description\"=>\"description\"}]" \
+ "\"stateMessage\"=>[{\"lockType\"=>\"EXCLUSIVE\",
\"description\"=>\"description\"}], " \
+ "\"executed\"=>false" \
"}\n\n",
output)
end
@@ -101,7 +102,8 @@ module Hbase
"\"className\"=>\"org.apache.hadoop.hbase.master.locking.LockProcedure\", " \
"\"procId\"=>\"0\", \"submittedTime\"=>\"0\",
\"state\"=>\"RUNNABLE\", " \
"\"lastUpdate\"=>\"0\", " \
- "\"stateMessage\"=>[{\"lockType\"=>\"EXCLUSIVE\",
\"description\"=>\"description\"}]" \
+ "\"stateMessage\"=>[{\"lockType\"=>\"EXCLUSIVE\",
\"description\"=>\"description\"}], " \
+ "\"executed\"=>false" \
"}\n\n",
output)
end
@@ -119,7 +121,8 @@ module Hbase
"\"className\"=>\"org.apache.hadoop.hbase.master.locking.LockProcedure\", " \
"\"procId\"=>\"1\", \"submittedTime\"=>\"0\",
\"state\"=>\"RUNNABLE\", " \
"\"lastUpdate\"=>\"0\", " \
- "\"stateMessage\"=>[{\"lockType\"=>\"EXCLUSIVE\",
\"description\"=>\"description\"}]" \
+ "\"stateMessage\"=>[{\"lockType\"=>\"EXCLUSIVE\",
\"description\"=>\"description\"}], " \
+ "\"executed\"=>false" \
"}\n\n" \
"TABLE(hbase:namespace)\n" \
"Lock type: SHARED, count: 1\n\n",
@@ -143,7 +146,8 @@ module Hbase
"\"className\"=>\"org.apache.hadoop.hbase.master.locking.LockProcedure\", " \
"\"procId\"=>\"2\", \"submittedTime\"=>\"0\",
\"state\"=>\"RUNNABLE\", " \
"\"lastUpdate\"=>\"0\", " \
- "\"stateMessage\"=>[{\"lockType\"=>\"EXCLUSIVE\",
\"description\"=>\"description\"}]" \
+ "\"stateMessage\"=>[{\"lockType\"=>\"EXCLUSIVE\",
\"description\"=>\"description\"}], " \
+ "\"executed\"=>false" \
"}\n\n",
output)
end
@@ -168,7 +172,8 @@ module Hbase
"\"className\"=>\"org.apache.hadoop.hbase.master.locking.LockProcedure\", " \
"\"procId\"=>\"3\", \"submittedTime\"=>\"0\",
\"state\"=>\"RUNNABLE\", " \
"\"lastUpdate\"=>\"0\", " \
- "\"stateMessage\"=>[{\"lockType\"=>\"EXCLUSIVE\",
\"description\"=>\"description\"}]" \
+ "\"stateMessage\"=>[{\"lockType\"=>\"EXCLUSIVE\",
\"description\"=>\"description\"}], " \
+ "\"executed\"=>false" \
"}\n\n",
output)
end
@@ -198,14 +203,14 @@ module Hbase
"\"lastUpdate\"=>\"0\", \"stateMessage\"=>[{" \
"\"lockType\"=>\"EXCLUSIVE\", " \
"\"tableName\"=>{\"namespace\"=>\"bnM0\",
\"qualifier\"=>\"dGFibGU0\"" \
- "}, \"description\"=>\"description\"}]}\n" \
+ "}, \"description\"=>\"description\"}], \"executed\"=>false}\n" \
"Waiting procedures\n" \
"{\"className\"=>\"org.apache.hadoop.hbase.master.locking.LockProcedure\", " \
"\"procId\"=>\"2\", \"submittedTime\"=>\"0\",
\"state\"=>\"RUNNABLE\", " \
"\"lastUpdate\"=>\"0\", \"stateMessage\"=>[{" \
"\"lockType\"=>\"SHARED\", " \
"\"tableName\"=>{\"namespace\"=>\"bnM0\",
\"qualifier\"=>\"dGFibGU0\"}, " \
- "\"description\"=>\"description\"}]}\n" \
+ "\"description\"=>\"description\"}], \"executed\"=>false}\n" \
"1 row(s)\n\n",
output)
end
