dlmarion commented on code in PR #3109:
URL: https://github.com/apache/accumulo/pull/3109#discussion_r1043537530


##########
server/manager/src/main/java/org/apache/accumulo/manager/upgrade/Upgrader9to10.java:
##########
@@ -165,8 +165,10 @@ private void validateACLs(ServerContext context) {
 
           if (((path.equals(Constants.ZROOT) || path.equals(Constants.ZROOT + 
Constants.ZINSTANCES))
               && !acls.equals(ZooDefs.Ids.OPEN_ACL_UNSAFE))
-              || (!privateWithAuth.equals(acls) && 
!publicWithAuth.equals(acls))) {
-            log.error("ZNode at {} has unexpected ACL: {}", path, acls);
+              || (!acls.containsAll(privateWithAuth) && 
!acls.containsAll(publicWithAuth))) {

Review Comment:
   IIRC from ZooKeeperInitializer:
   
   ZROOT -> ZooDefs.Ids.OPEN_ACL_UNSAFE
   ZROOT + ZINSTANCES -> ZooDefs.Ids.OPEN_ACL_UNSAFE
   ZROOT/IID/config -> ZooUtil.PRIVATE
   Everything else has ZooUtil.PUBLIC



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to