This is an automated email from the ASF dual-hosted git repository.
vjasani pushed a change to branch HBASE-29368-key-management-feature
in repository https://gitbox.apache.org/repos/asf/hbase.git
from 3de7a7ce683 Merge branch 'master' of github.com:apache/hbase into
HBASE-29368-key-management-feature
add c22e111a491 Make the keymeta table initialization happen in a
predictable manner (#7433)
No new revisions were added by this update.
Summary of changes:
.../java/org/apache/hadoop/hbase/client/Admin.java | 2 +-
.../hadoop/hbase/client/AdminOverAsyncAdmin.java | 4 +-
.../org/apache/hadoop/hbase/client/AsyncAdmin.java | 2 +-
.../hadoop/hbase/client/AsyncHBaseAdmin.java | 4 +-
.../hadoop/hbase/client/RawAsyncHBaseAdmin.java | 2 +-
.../apache/hadoop/hbase/procedure2/Procedure.java | 9 +
.../hadoop/hbase/procedure2/ProcedureExecutor.java | 1 +
.../hadoop/hbase/procedure2/ProcedureUtil.java | 8 +
.../src/main/protobuf/server/Procedure.proto | 3 +
.../hadoop/hbase/keymeta/KeymetaAdminImpl.java | 2 +-
.../hadoop/hbase/keymeta/KeymetaMasterService.java | 57 ------
.../hadoop/hbase/keymeta/KeymetaTableAccessor.java | 9 +
.../hadoop/hbase/keymeta/ManagedKeyDataCache.java | 2 +-
.../org/apache/hadoop/hbase/master/HMaster.java | 113 ++++++++++--
.../hbase/master/assignment/AssignmentManager.java | 24 ++-
.../assignment/RegionRemoteProcedureBase.java | 3 +
.../assignment/TransitRegionStateProcedure.java | 3 +
.../master/procedure/CreateTableProcedure.java | 3 +
.../hadoop/hbase/keymeta/ManagedKeyTestBase.java | 2 +
.../hbase/keymeta/TestKeymetaMasterService.java | 199 ---------------------
.../hadoop/hbase/master/TestKeymetaAdminImpl.java | 8 +-
.../hadoop/hbase/master/TestMasterFailover.java | 145 +++++++++------
.../hbase/rsgroup/VerifyingRSGroupAdmin.java | 4 +-
.../hadoop/hbase/thrift2/client/ThriftAdmin.java | 4 +-
24 files changed, 270 insertions(+), 343 deletions(-)
delete mode 100644
hbase-server/src/main/java/org/apache/hadoop/hbase/keymeta/KeymetaMasterService.java
delete mode 100644
hbase-server/src/test/java/org/apache/hadoop/hbase/keymeta/TestKeymetaMasterService.java