diff --git a/hudi-sync/hudi-hive-sync/src/main/java/org/apache/hudi/hive/replication/HiveSyncGlobalCommitTool.java b/hudi-sync/hudi-hive-sync/src/main/java/org/apache/hudi/hive/replication/HiveSyncGlobalCommitTool.java index 13b2d69b64d6c..9ca842d159aac 100644 --- a/hudi-sync/hudi-hive-sync/src/main/java/org/apache/hudi/hive/replication/HiveSyncGlobalCommitTool.java +++ b/hudi-sync/hudi-hive-sync/src/main/java/org/apache/hudi/hive/replication/HiveSyncGlobalCommitTool.java @@ -39,7 +39,7 @@ public class HiveSyncGlobalCommitTool implements HiveSyncGlobalCommit, AutoClose private final HiveSyncGlobalCommitParams params; private final List replicationStateSyncList; - private ReplicationStateSync getReplicatedState(boolean forRemote) { + ReplicationStateSync getReplicatedState(boolean forRemote) { HiveConf hiveConf = new HiveConf(); // we probably just need to set the metastore URIs // TODO: figure out how to integrate this in production diff --git a/hudi-sync/hudi-hive-sync/src/main/java/org/apache/hudi/hive/replication/ReplicationStateSync.java b/hudi-sync/hudi-hive-sync/src/main/java/org/apache/hudi/hive/replication/ReplicationStateSync.java index bc16f5b6d9f96..c2ed57e6becbe 100644 --- a/hudi-sync/hudi-hive-sync/src/main/java/org/apache/hudi/hive/replication/ReplicationStateSync.java +++ b/hudi-sync/hudi-hive-sync/src/main/java/org/apache/hudi/hive/replication/ReplicationStateSync.java @@ -27,7 +27,7 @@ public class ReplicationStateSync implements AutoCloseable { - private GlobalHiveSyncTool globalHiveSyncTool; + protected GlobalHiveSyncTool globalHiveSyncTool; private Map> replicatedTimeStampMap; private Map> oldReplicatedTimeStampMap; private final String clusterId; diff --git a/hudi-sync/hudi-hive-sync/src/test/java/org/apache/hudi/hive/TestHiveSyncGlobalCommitTool.java b/hudi-sync/hudi-hive-sync/src/test/java/org/apache/hudi/hive/replication/TestHiveSyncGlobalCommitTool.java similarity index 83% rename from hudi-sync/hudi-hive-sync/src/test/java/org/apache/hudi/hive/TestHiveSyncGlobalCommitTool.java rename to hudi-sync/hudi-hive-sync/src/test/java/org/apache/hudi/hive/replication/TestHiveSyncGlobalCommitTool.java index 0930b792c8d2f..52e0301023afa 100644 --- a/hudi-sync/hudi-hive-sync/src/test/java/org/apache/hudi/hive/TestHiveSyncGlobalCommitTool.java +++ b/hudi-sync/hudi-hive-sync/src/test/java/org/apache/hudi/hive/replication/TestHiveSyncGlobalCommitTool.java @@ -7,16 +7,17 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ -package org.apache.hudi.hive; +package org.apache.hudi.hive.replication; import org.apache.hudi.hive.replication.HiveSyncGlobalCommitParams; import org.apache.hudi.hive.replication.HiveSyncGlobalCommitTool; @@ -101,6 +102,22 @@ public void clear() throws Exception { remoteCluster.getHMSClient().dropTable(DB_NAME, TBL_NAME); } + @Test + public void testHiveConfigShouldMatchClusterConf() throws Exception{ + String commitTime = "100"; + localCluster.createCOWTable(commitTime, 5, DB_NAME, TBL_NAME); + // simulate drs + remoteCluster.createCOWTable(commitTime, 5, DB_NAME, TBL_NAME); + HiveSyncGlobalCommitParams params = getGlobalCommitConfig(commitTime); + HiveSyncGlobalCommitTool tool = new HiveSyncGlobalCommitTool(params); + ReplicationStateSync localReplicationStateSync = tool.getReplicatedState(false); + ReplicationStateSync remoteReplicationStateSync = tool.getReplicatedState(true); + assertEquals(localReplicationStateSync.globalHiveSyncTool.config.getHiveConf().get("hive.metastore.uris"), + localCluster.getHiveConf().get("hive.metastore.uris")); + assertEquals(remoteReplicationStateSync.globalHiveSyncTool.config.getHiveConf().get("hive.metastore.uris"), + remoteCluster.getHiveConf().get("hive.metastore.uris")); + } + @Test public void testBasicGlobalCommit() throws Exception { String commitTime = "100";