Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bug 4823: Notify findPrimary callbacks on ReachableMember event
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
ShardRecoveryCoordinator.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardRecoveryCoordinator.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardRecoveryCoordinator.java
index f8c1db987912e44e487088abb9dd3d903b0c8fee..82a6b720f07d05303991235619515641af02acd6 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardRecoveryCoordinator.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardRecoveryCoordinator.java
@@
-44,9
+44,12
@@
class ShardRecoveryCoordinator implements RaftActorRecoveryCohort {
private final Set<URI> validNamespaces;
private PruningDataTreeModification transaction;
private int size;
private final Set<URI> validNamespaces;
private PruningDataTreeModification transaction;
private int size;
+ private final byte[] restoreFromSnapshot;
- ShardRecoveryCoordinator(ShardDataTree store, SchemaContext schemaContext, String shardName, Logger log) {
+ ShardRecoveryCoordinator(ShardDataTree store, SchemaContext schemaContext, byte[] restoreFromSnapshot,
+ String shardName, Logger log) {
this.store = Preconditions.checkNotNull(store);
this.store = Preconditions.checkNotNull(store);
+ this.restoreFromSnapshot = restoreFromSnapshot;
this.shardName = shardName;
this.log = log;
this.validNamespaces = NormalizedNodePruner.namespaces(schemaContext);
this.shardName = shardName;
this.log = log;
this.validNamespaces = NormalizedNodePruner.namespaces(schemaContext);
@@
-125,4
+128,9
@@
class ShardRecoveryCoordinator implements RaftActorRecoveryCohort {
log.error("{}: Failed to apply recovery snapshot", shardName, e);
}
}
log.error("{}: Failed to apply recovery snapshot", shardName, e);
}
}
+
+ @Override
+ public byte[] getRestoreFromSnapshot() {
+ return restoreFromSnapshot;
+ }
}
}