You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2016/12/29 09:37:35 UTC
[31/50] [abbrv] ignite git commit: GG-11808 Implement deletion of
snapshots on platform level
GG-11808 Implement deletion of snapshots on platform level
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/561101f6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/561101f6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/561101f6
Branch: refs/heads/ignite-3477
Commit: 561101f6b644945494be7c23e79d1e40b2aa5bb9
Parents: 9217f3f
Author: EdShangGG <es...@gridgain.com>
Authored: Thu Dec 22 22:07:14 2016 +0300
Committer: EdShangGG <es...@gridgain.com>
Committed: Thu Dec 22 22:07:14 2016 +0300
----------------------------------------------------------------------
.../pagemem/snapshot/StartFullSnapshotDiscoveryMessage.java | 7 +++++++
.../processors/cache/database/tree/io/PageMetaIO.java | 3 ++-
2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/561101f6/modules/core/src/main/java/org/apache/ignite/internal/pagemem/snapshot/StartFullSnapshotDiscoveryMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/snapshot/StartFullSnapshotDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/snapshot/StartFullSnapshotDiscoveryMessage.java
index 830326e..08e093d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/snapshot/StartFullSnapshotDiscoveryMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/snapshot/StartFullSnapshotDiscoveryMessage.java
@@ -48,8 +48,10 @@ public class StartFullSnapshotDiscoveryMessage implements DiscoveryCustomMessage
/** Error. */
private Exception err;
+ /** Full snapshot. */
private boolean fullSnapshot;
+ /** Last full snapshot id for cache. */
private Map<Integer, Long> lastFullSnapshotIdForCache = new HashMap<>();
/**
@@ -125,6 +127,7 @@ public class StartFullSnapshotDiscoveryMessage implements DiscoveryCustomMessage
/** {@inheritDoc} */
@Nullable @Override public DiscoveryCustomMessage ackMessage() {
+ System.out.println("StartFullSnapshotAckDiscoveryMessage - " + fullSnapshot);
return new StartFullSnapshotAckDiscoveryMessage(globalSnapshotId, fullSnapshot, lastFullSnapshotIdForCache, cacheNames, err, initiatorId);
}
@@ -132,4 +135,8 @@ public class StartFullSnapshotDiscoveryMessage implements DiscoveryCustomMessage
@Override public boolean isMutable() {
return true;
}
+
+ public void fullSnapshot(boolean b) {
+ fullSnapshot = b;
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/561101f6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/PageMetaIO.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/PageMetaIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/PageMetaIO.java
index ee862ee..2c5f7a6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/PageMetaIO.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/PageMetaIO.java
@@ -80,6 +80,7 @@ public class PageMetaIO extends PageIO {
setLastSuccessfulFullSnapshotId(buf, 0);
setLastSuccessfulSnapshotId(buf, 0);
setNextSnapshotTag(buf, 1);
+ setLastSuccessfulSnapshotTag(buf, 0);
setLastAllocatedIndex(buf, 0);
setCandidateAllocatedIndex(buf, 0);
}
@@ -135,7 +136,7 @@ public class PageMetaIO extends PageIO {
* @param buf Buffer.
* @param lastSuccessfulFullSnapshotId Last successful full snapshot id.
*/
- public void setLastSuccessfulFullSnapshotId(@NotNull ByteBuffer buf, long lastSuccessfulFullSnapshotId) {
+ public void setLastSuccessfulFullSnapshotId(@NotNull ByteBuffer buf, long lastSuccessfulFullSnapshotId) {
buf.putLong(LAST_SUCCESSFUL_FULL_SNAPSHOT_ID_OFF, lastSuccessfulFullSnapshotId);
}