Skip to content

Commit dbc165a

Browse files
committed
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 7dd4d0c)
1 parent 0f34724 commit dbc165a

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

hbase-shell/src/test/ruby/shell/list_locks_test.rb

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ def create_shared_lock(proc_id)
8181
"\"className\"=>\"org.apache.hadoop.hbase.master.locking.LockProcedure\", " \
8282
"\"procId\"=>\"0\", \"submittedTime\"=>\"0\", \"state\"=>\"RUNNABLE\", " \
8383
"\"lastUpdate\"=>\"0\", " \
84-
"\"stateMessage\"=>[{\"lockType\"=>\"EXCLUSIVE\", \"description\"=>\"description\"}]" \
84+
"\"stateMessage\"=>[{\"lockType\"=>\"EXCLUSIVE\", \"description\"=>\"description\"}], " \
85+
"\"executed\"=>false" \
8586
"}\n\n",
8687
output)
8788
end
@@ -101,7 +102,8 @@ def create_shared_lock(proc_id)
101102
"\"className\"=>\"org.apache.hadoop.hbase.master.locking.LockProcedure\", " \
102103
"\"procId\"=>\"0\", \"submittedTime\"=>\"0\", \"state\"=>\"RUNNABLE\", " \
103104
"\"lastUpdate\"=>\"0\", " \
104-
"\"stateMessage\"=>[{\"lockType\"=>\"EXCLUSIVE\", \"description\"=>\"description\"}]" \
105+
"\"stateMessage\"=>[{\"lockType\"=>\"EXCLUSIVE\", \"description\"=>\"description\"}], " \
106+
"\"executed\"=>false" \
105107
"}\n\n",
106108
output)
107109
end
@@ -119,7 +121,8 @@ def create_shared_lock(proc_id)
119121
"\"className\"=>\"org.apache.hadoop.hbase.master.locking.LockProcedure\", " \
120122
"\"procId\"=>\"1\", \"submittedTime\"=>\"0\", \"state\"=>\"RUNNABLE\", " \
121123
"\"lastUpdate\"=>\"0\", " \
122-
"\"stateMessage\"=>[{\"lockType\"=>\"EXCLUSIVE\", \"description\"=>\"description\"}]" \
124+
"\"stateMessage\"=>[{\"lockType\"=>\"EXCLUSIVE\", \"description\"=>\"description\"}], " \
125+
"\"executed\"=>false" \
123126
"}\n\n" \
124127
"TABLE(hbase:namespace)\n" \
125128
"Lock type: SHARED, count: 1\n\n",
@@ -143,7 +146,8 @@ def create_shared_lock(proc_id)
143146
"\"className\"=>\"org.apache.hadoop.hbase.master.locking.LockProcedure\", " \
144147
"\"procId\"=>\"2\", \"submittedTime\"=>\"0\", \"state\"=>\"RUNNABLE\", " \
145148
"\"lastUpdate\"=>\"0\", " \
146-
"\"stateMessage\"=>[{\"lockType\"=>\"EXCLUSIVE\", \"description\"=>\"description\"}]" \
149+
"\"stateMessage\"=>[{\"lockType\"=>\"EXCLUSIVE\", \"description\"=>\"description\"}], " \
150+
"\"executed\"=>false" \
147151
"}\n\n",
148152
output)
149153
end
@@ -168,7 +172,8 @@ def create_shared_lock(proc_id)
168172
"\"className\"=>\"org.apache.hadoop.hbase.master.locking.LockProcedure\", " \
169173
"\"procId\"=>\"3\", \"submittedTime\"=>\"0\", \"state\"=>\"RUNNABLE\", " \
170174
"\"lastUpdate\"=>\"0\", " \
171-
"\"stateMessage\"=>[{\"lockType\"=>\"EXCLUSIVE\", \"description\"=>\"description\"}]" \
175+
"\"stateMessage\"=>[{\"lockType\"=>\"EXCLUSIVE\", \"description\"=>\"description\"}], " \
176+
"\"executed\"=>false" \
172177
"}\n\n",
173178
output)
174179
end
@@ -198,14 +203,14 @@ def create_shared_lock(proc_id)
198203
"\"lastUpdate\"=>\"0\", \"stateMessage\"=>[{" \
199204
"\"lockType\"=>\"EXCLUSIVE\", " \
200205
"\"tableName\"=>{\"namespace\"=>\"bnM0\", \"qualifier\"=>\"dGFibGU0\"" \
201-
"}, \"description\"=>\"description\"}]}\n" \
206+
"}, \"description\"=>\"description\"}], \"executed\"=>false}\n" \
202207
"Waiting procedures\n" \
203208
"{\"className\"=>\"org.apache.hadoop.hbase.master.locking.LockProcedure\", " \
204209
"\"procId\"=>\"2\", \"submittedTime\"=>\"0\", \"state\"=>\"RUNNABLE\", " \
205210
"\"lastUpdate\"=>\"0\", \"stateMessage\"=>[{" \
206211
"\"lockType\"=>\"SHARED\", " \
207212
"\"tableName\"=>{\"namespace\"=>\"bnM0\", \"qualifier\"=>\"dGFibGU0\"}, " \
208-
"\"description\"=>\"description\"}]}\n" \
213+
"\"description\"=>\"description\"}], \"executed\"=>false}\n" \
209214
"1 row(s)\n\n",
210215
output)
211216
end

0 commit comments

Comments
 (0)