HBASE-26662 User.createUserForTesting should not reset UserProvider.groups every time if hbase.group.service.for.test.only is true (#4029)

wchevreuil · wchevreuil · commit e3e42df7f2f9 · 2022-01-18T12:35:14.000Z
Signed-off-by: Josh Elser &lt;elserj@apache.org&gt;
Signrd-off-by: Duo Zhang &lt;zhangduo@apache.org&gt;
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/security/User.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/security/User.java
@@ -351,8 +351,7 @@ public <T> T runAs(PrivilegedExceptionAction<T> action)
     public static User createUserForTesting(Configuration conf,
         String name, String[] groups) {
       synchronized (UserProvider.class) {
-        if (!(UserProvider.groups instanceof TestingGroups) ||
-            conf.getBoolean(TestingGroups.TEST_CONF, false)) {
+        if (!(UserProvider.groups instanceof TestingGroups)) {
           UserProvider.groups = new TestingGroups(UserProvider.groups);
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -351,8 +351,7 @@ public <T> T runAs(PrivilegedExceptionAction<T> action)`
`351`	`351`	`public static User createUserForTesting(Configuration conf,`
`352`	`352`	`String name, String[] groups) {`
`353`	`353`	`synchronized (UserProvider.class) {`
`354`		`- if (!(UserProvider.groups instanceof TestingGroups) \|\|`
`355`		`- conf.getBoolean(TestingGroups.TEST_CONF, false)) {`
	`354`	`+ if (!(UserProvider.groups instanceof TestingGroups)) {`
`356`	`355`	`UserProvider.groups = new TestingGroups(UserProvider.groups);`
`357`	`356`	`}`
`358`	`357`	`}`