*/
package org.opendaylight.controller.cluster.datastore;
-import com.google.common.base.Preconditions;
+import static com.google.common.base.Preconditions.checkState;
+import static java.util.Objects.requireNonNull;
+
import java.io.File;
import org.opendaylight.controller.cluster.datastore.persisted.ShardDataTreeSnapshot;
import org.opendaylight.controller.cluster.datastore.persisted.ShardSnapshotState;
WithSnapshot(final ShardDataTree store, final String shardName, final Logger log, final Snapshot snapshot) {
super(store, shardName, log);
- this.restoreFromSnapshot = Preconditions.checkNotNull(snapshot);
+ restoreFromSnapshot = requireNonNull(snapshot);
}
@Override
private boolean open;
ShardRecoveryCoordinator(final ShardDataTree store, final String shardName, final Logger log) {
- this.store = Preconditions.checkNotNull(store);
- this.shardName = Preconditions.checkNotNull(shardName);
- this.log = Preconditions.checkNotNull(log);
+ this.store = requireNonNull(store);
+ this.shardName = requireNonNull(shardName);
+ this.log = requireNonNull(log);
}
static ShardRecoveryCoordinator create(final ShardDataTree store, final String shardName, final Logger log) {
@Override
@SuppressWarnings("checkstyle:IllegalCatch")
public void appendRecoveredLogEntry(final Payload payload) {
- Preconditions.checkState(open, "call startLogRecovery before calling appendRecoveredLogEntry");
+ checkState(open, "call startLogRecovery before calling appendRecoveredLogEntry");
try {
store.applyRecoveryPayload(payload);
*/
@Override
public void applyCurrentLogRecoveryBatch() {
- Preconditions.checkState(open, "call startLogRecovery before calling applyCurrentLogRecoveryBatch");
+ checkState(open, "call startLogRecovery before calling applyCurrentLogRecoveryBatch");
open = false;
}
- private File writeRoot(final String kind, final NormalizedNode<?, ?> node) {
+ private File writeRoot(final String kind, final NormalizedNode node) {
final File file = new File(System.getProperty("karaf.data", "."),
"failed-recovery-" + kind + "-" + shardName + ".xml");
NormalizedNodeXMLOutput.toFile(file, node);
public void applyRecoverySnapshot(final Snapshot.State snapshotState) {
if (!(snapshotState instanceof ShardSnapshotState)) {
log.debug("{}: applyRecoverySnapshot ignoring snapshot: {}", shardName, snapshotState);
+ return;
}
log.debug("{}: Applying recovered snapshot", shardName);
-
- ShardDataTreeSnapshot shardSnapshot = ((ShardSnapshotState)snapshotState).getSnapshot();
+ final ShardSnapshotState shardSnapshotState = (ShardSnapshotState)snapshotState;
try {
- store.applyRecoverySnapshot(shardSnapshot);
+ store.applyRecoverySnapshot(shardSnapshotState);
} catch (Exception e) {
+ final ShardDataTreeSnapshot shardSnapshot = shardSnapshotState.getSnapshot();
final File f = writeRoot("snapshot", shardSnapshot.getRootNode().orElse(null));
throw new IllegalStateException(String.format(
"%s: Failed to apply recovery snapshot %s. Node data was written to file %s",