ArkoSharma commented on a change in pull request #2539:
URL: https://github.com/apache/hive/pull/2539#discussion_r759026652
##########
File path: ql/src/java/org/apache/hadoop/hive/ql/exec/repl/ReplDumpTask.java
##########
@@ -1105,17 +1105,15 @@ Long bootStrapDump(Path dumpRoot, DumpMetaData dmd,
Path cmRoot, Hive hiveDb)
boolean isExternalTablePresent = false;
String snapshotPrefix = dbName.toLowerCase();
- ArrayList<String> prevSnaps = new ArrayList<>(); // Will stay empty
in case of bootstrap
+ ArrayList<String> prevSnaps = new ArrayList<>();
if (isSnapshotEnabled) {
- // Delete any old existing snapshot file, We always start fresh in
case of bootstrap.
FileUtils.deleteIfExists(getDFS(SnapshotUtils.getSnapshotFileListPath(dumpRoot),
conf),
- new Path(SnapshotUtils.getSnapshotFileListPath(dumpRoot),
- EximUtil.FILE_LIST_EXTERNAL_SNAPSHOT_CURRENT));
-
FileUtils.deleteIfExists(getDFS(SnapshotUtils.getSnapshotFileListPath(dumpRoot),
conf),
Review comment:
made the change.
##########
File path: ql/src/java/org/apache/hadoop/hive/ql/exec/repl/DirCopyTask.java
##########
@@ -254,23 +256,55 @@ public boolean canExecuteInParallel() {
return true;
}
- boolean copyUsingDistCpSnapshots(Path sourcePath, Path targetPath,
UserGroupInformation proxyUser,
+ boolean copyUsingDistCpSnapshots(Path sourcePath, Path targetPath,
UserGroupInformation proxyUser, boolean isBootstrap,
HiveConf clonedConf) throws IOException {
DistributedFileSystem targetFs = SnapshotUtils.getDFS(targetPath,
clonedConf);
boolean result = false;
+ String snapPrefix = work.getSnapshotPrefix();
+ if(isBootstrap && conf.getBoolVar(HiveConf.ConfVars.REPL_REUSE_SNAPSHOTS))
{
+ // in case of bootstrap replication from B to A (reverse replication),
rename snapshots in A
+ // as they might have been renamed during dump in B
+ FileStatus[] listing = targetFs.listStatus(new Path(targetPath,
".snapshot"));
+ for (FileStatus elem : listing) {
+ String snapShotName = elem.getPath().getName();
+ String prefix;
+ if (snapShotName.contains(OLD_SNAPSHOT)) {
+ prefix = snapShotName.substring(0,
snapShotName.lastIndexOf(OLD_SNAPSHOT));
+ if (!prefix.equals(snapPrefix)) {
+ targetFs.renameSnapshot(targetPath, firstSnapshot(prefix),
firstSnapshot(snapPrefix));
+ }
+ }
+ if (snapShotName.contains(NEW_SNAPSHOT)) {
+ prefix = snapShotName.substring(0,
snapShotName.lastIndexOf(NEW_SNAPSHOT));
+ if (!prefix.equals(snapPrefix)) {
+ targetFs.renameSnapshot(targetPath, secondSnapshot(prefix),
secondSnapshot(snapPrefix));
+ }
+ }
+ }
Review comment:
done.
--
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]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
