Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix raw type warnings
[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 87d591dd228286c9f7da385f6d8c42a34b1286c0..634121f5e5e669b5038246876ea0228b454edfe5 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
@@
-11,7
+11,6
@@
import com.google.common.base.Preconditions;
import java.io.IOException;
import java.net.URI;
import java.util.Set;
import java.io.IOException;
import java.net.URI;
import java.util.Set;
-import org.opendaylight.controller.cluster.datastore.modification.ModificationPayload;
import org.opendaylight.controller.cluster.datastore.modification.MutableCompositeModification;
import org.opendaylight.controller.cluster.datastore.node.utils.transformer.NormalizedNodePruner;
import org.opendaylight.controller.cluster.datastore.utils.PruningDataTreeModification;
import org.opendaylight.controller.cluster.datastore.modification.MutableCompositeModification;
import org.opendaylight.controller.cluster.datastore.node.utils.transformer.NormalizedNodePruner;
import org.opendaylight.controller.cluster.datastore.utils.PruningDataTreeModification;
@@
-44,9
+43,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);
@@
-67,10
+69,6
@@
class ShardRecoveryCoordinator implements RaftActorRecoveryCohort {
if (payload instanceof DataTreeCandidatePayload) {
DataTreeCandidates.applyToModification(transaction, ((DataTreeCandidatePayload)payload).getCandidate());
size++;
if (payload instanceof DataTreeCandidatePayload) {
DataTreeCandidates.applyToModification(transaction, ((DataTreeCandidatePayload)payload).getCandidate());
size++;
- } else if (payload instanceof ModificationPayload) {
- MutableCompositeModification.fromSerializable(
- ((ModificationPayload) payload).getModification()).apply(transaction);
- size++;
} else if (payload instanceof CompositeModificationPayload) {
MutableCompositeModification.fromSerializable(
((CompositeModificationPayload) payload).getModification()).apply(transaction);
} else if (payload instanceof CompositeModificationPayload) {
MutableCompositeModification.fromSerializable(
((CompositeModificationPayload) payload).getModification()).apply(transaction);
@@
-82,7
+80,7
@@
class ShardRecoveryCoordinator implements RaftActorRecoveryCohort {
} else {
log.error("{}: Unknown payload {} received during recovery", shardName, payload);
}
} else {
log.error("{}: Unknown payload {} received during recovery", shardName, payload);
}
- } catch (IOException
| ClassNotFoundException
e) {
+ } catch (IOException e) {
log.error("{}: Error extracting ModificationPayload", shardName, e);
}
}
log.error("{}: Error extracting ModificationPayload", shardName, e);
}
}
@@
-128,7
+126,6
@@
class ShardRecoveryCoordinator implements RaftActorRecoveryCohort {
@Override
public byte[] getRestoreFromSnapshot() {
@Override
public byte[] getRestoreFromSnapshot() {
- // TODO Auto-generated method stub
- return null;
+ return restoreFromSnapshot;
}
}
}
}