[ https://issues.apache.org/jira/browse/HIVE-22736?focusedWorklogId=380682&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-380682 ]
ASF GitHub Bot logged work on HIVE-22736: ----------------------------------------- Author: ASF GitHub Bot Created on: 03/Feb/20 04:30 Start Date: 03/Feb/20 04:30 Worklog Time Spent: 10m Work Description: maheshk114 commented on pull request #883: HIVE-22736 Support multiple encryption zones in replication URL: https://github.com/apache/hive/pull/883#discussion_r373917644 ########## File path: standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/ReplChangeManager.java ########## @@ -531,30 +541,23 @@ private static Path getCmRoot(Path path) throws IOException { Path cmroot = null; if (enabled) { HdfsEncryptionShim pathEncryptionShim = hadoopShims.createHdfsEncryptionShim(path.getFileSystem(conf), conf); - if (!pathEncryptionShim.isPathEncrypted(path)) { - if (encryptionZones.containsKey(NO_ENCRYPTION)) { - cmroot = encryptionZones.get(NO_ENCRYPTION); - } else { + if (pathEncryptionShim.isPathEncrypted(path)) { + String encryptionZonePath = path.getFileSystem(conf).getUri() + + pathEncryptionShim.getEncryptionZoneForPath(path).getPath(); + cmroot = new Path(encryptionZonePath + Path.SEPARATOR + encryptedCmRootDir); + if (!encryptionZones.contains(encryptionZonePath)) { Review comment: This check is done twice ---------------------------------------------------------------- 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking ------------------- Worklog Id: (was: 380682) Time Spent: 2h 50m (was: 2h 40m) > Support replication across multiple encryption zones > ---------------------------------------------------- > > Key: HIVE-22736 > URL: https://issues.apache.org/jira/browse/HIVE-22736 > Project: Hive > Issue Type: Task > Reporter: Aasha Medhi > Assignee: Aasha Medhi > Priority: Major > Labels: pull-request-available > Attachments: HIVE-22736.patch, HIVE-22736.patch, HIVE-22736.patch, > HIVE-22736.patch, HIVE-22736.patch, HIVE-22736.patch, HIVE-22736.patch, > HIVE-22736.patch, HIVE-22736.patch, HIVE-22736.patch, HIVE-22736.patch, > HIVE-22736.patch, HIVE-22736.patch, HIVE-22736.patch, HIVE-22736.patch, > HIVE-22736.patch, HIVE-22736.patch, HIVE-22736.patch, HIVE-22736.patch, > HIVE-22736.patch, HIVE-22736.patch > > Time Spent: 2h 50m > Remaining Estimate: 0h > -- This message was sent by Atlassian Jira (v8.3.4#803005)