[
https://issues.apache.org/jira/browse/GEODE-3885?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16215327#comment-16215327
]
ASF GitHub Bot commented on GEODE-3885:
---------------------------------------
nreich closed pull request #964: GEODE-3885: Fix backup from
AdminDistributedSystem
URL: https://github.com/apache/geode/pull/964
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java
b/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java
index 18475867d6..f166224564 100755
---
a/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java
+++
b/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java
@@ -2312,8 +2312,7 @@ public BackupStatus backupAllMembers(File targetDir, File
baselineDir) throws Ad
public static BackupStatus backupAllMembers(DM dm, File targetDir, File
baselineDir)
throws AdminException {
- return (org.apache.geode.admin.BackupStatus)
BackupUtil.backupAllMembers(dm, targetDir,
- baselineDir);
+ return new BackupStatusImpl(BackupUtil.backupAllMembers(dm, targetDir,
baselineDir));
}
public Map<DistributedMember, Set<PersistentID>> compactAllDiskStores()
throws AdminException {
diff --git
a/geode-core/src/main/java/org/apache/geode/admin/internal/BackupStatusImpl.java
b/geode-core/src/main/java/org/apache/geode/admin/internal/BackupStatusImpl.java
index f915fd495d..62949d8279 100644
---
a/geode-core/src/main/java/org/apache/geode/admin/internal/BackupStatusImpl.java
+++
b/geode-core/src/main/java/org/apache/geode/admin/internal/BackupStatusImpl.java
@@ -17,14 +17,37 @@
import java.util.Map;
import java.util.Set;
+import org.apache.geode.admin.BackupStatus;
import org.apache.geode.cache.persistence.PersistentID;
import org.apache.geode.distributed.DistributedMember;
-public class BackupStatusImpl extends
org.apache.geode.management.internal.BackupStatusImpl {
+/**
+ * @deprecated as of 7.0 use the <code><a href=
+ *
"{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
+ */
+public class BackupStatusImpl implements BackupStatus {
private static final long serialVersionUID = 3704162840296921841L;
+ private org.apache.geode.management.BackupStatus status;
+
public BackupStatusImpl(Map<DistributedMember, Set<PersistentID>>
backedUpDiskStores,
Set<PersistentID> offlineDiskStores) {
- super(backedUpDiskStores, offlineDiskStores);
+ status = new
org.apache.geode.management.internal.BackupStatusImpl(backedUpDiskStores,
+ offlineDiskStores);
+ }
+
+ BackupStatusImpl(org.apache.geode.management.BackupStatus status) {
+ this.status = status;
+ }
+
+ @Override
+ public Map<DistributedMember, Set<PersistentID>> getBackedUpDiskStores() {
+ return status.getBackedUpDiskStores();
+ }
+
+ @Override
+ public Set<PersistentID> getOfflineDiskStores() {
+ return status.getOfflineDiskStores();
}
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> Backup refactoring broke legacy interface
> -----------------------------------------
>
> Key: GEODE-3885
> URL: https://issues.apache.org/jira/browse/GEODE-3885
> Project: Geode
> Issue Type: Bug
> Components: persistence
> Reporter: Nick Reich
> Assignee: Nick Reich
>
> Refactoring of the backup code accidentally broke functionality in the
> (deprecated) AdminDistributedSystem.
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)
