geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nre...@apache.org
Subject [geode] branch develop updated: GEODE-3885: Fix backup from AdminDistributedSystem (#964)
Date Mon, 23 Oct 2017 15:52:45 GMT
This is an automated email from the ASF dual-hosted git repository.

nreich pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new c092bc6  GEODE-3885: Fix backup from AdminDistributedSystem (#964)
c092bc6 is described below

commit c092bc6823ad9c9393c66281fb6f88e6ffc0c5e5
Author: Nick Reich <nreich@pivotal.io>
AuthorDate: Mon Oct 23 08:52:43 2017 -0700

    GEODE-3885: Fix backup from AdminDistributedSystem (#964)
---
 .../admin/internal/AdminDistributedSystemImpl.java |  3 +--
 .../geode/admin/internal/BackupStatusImpl.java     | 27 ++++++++++++++++++++--
 2 files changed, 26 insertions(+), 4 deletions(-)

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 1847586..f166224 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 class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
 
   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 f915fd4..62949d8 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 @@ package org.apache.geode.admin.internal;
 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();
   }
 }

-- 
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <commits@geode.apache.org>'].

Mime
View raw message