Code Review
/
controller.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
|
inline
| side by side (parent:
9409f87
)
BUG-8159: add payload debugs
72/55072/1
author
Robert Varga
<robert.varga@pantheon.tech>
Wed, 12 Apr 2017 15:59:33 +0000
(17:59 +0200)
committer
Robert Varga
<nite@hq.sk>
Fri, 14 Apr 2017 22:16:20 +0000
(22:16 +0000)
This patch adds debugging of metadata snapshot application
and recovery operations.
Change-Id: I9498f53af6ddc8fecf42eb239c7da7da08d3f0c6
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit
2fd4150b338a3cbd422a3daff895bb5c9afcd7a6
)
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/FrontendClientMetadataBuilder.java
patch
|
blob
|
history
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/FrontendMetadata.java
patch
|
blob
|
history
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardDataTree.java
patch
|
blob
|
history
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardSnapshotCohort.java
patch
|
blob
|
history
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/FrontendClientMetadata.java
patch
|
blob
|
history
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/FrontendHistoryMetadata.java
patch
|
blob
|
history
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/MetadataShardDataTreeSnapshot.java
patch
|
blob
|
history
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/FrontendClientMetadataBuilder.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/FrontendClientMetadataBuilder.java
index ec2cdb6daa209a9f7ad2b2474ccf454166f9da57..a13899c354b165526674469bbe02f8c9ad90cc12 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/FrontendClientMetadataBuilder.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/FrontendClientMetadataBuilder.java
@@
-7,6
+7,7
@@
*/
package org.opendaylight.controller.cluster.datastore;
*/
package org.opendaylight.controller.cluster.datastore;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Preconditions;
import com.google.common.base.Verify;
import com.google.common.collect.Collections2;
import com.google.common.base.Preconditions;
import com.google.common.base.Verify;
import com.google.common.collect.Collections2;
@@
-175,4
+176,10
@@
final class FrontendClientMetadataBuilder implements Builder<FrontendClientMetad
private FrontendHistoryMetadataBuilder getHistory(final TransactionIdentifier txId) {
return currentHistories.get(txId.getHistoryId());
}
private FrontendHistoryMetadataBuilder getHistory(final TransactionIdentifier txId) {
return currentHistories.get(txId.getHistoryId());
}
+
+ @Override
+ public String toString() {
+ return MoreObjects.toStringHelper(this).add("identifier", identifier).add("current", currentHistories)
+ .add("purged", purgedHistories).toString();
+ }
}
}
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/FrontendMetadata.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/FrontendMetadata.java
index 5f86125523cb37fd0be72dc5157947d21a316f7c..39d04286c44ab5fff0337e58ee66312b37d9d9e5 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/FrontendMetadata.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/FrontendMetadata.java
@@
-48,15
+48,22
@@
final class FrontendMetadata extends ShardDataTreeMetadata<FrontendShardDataTree
@Override
void reset() {
@Override
void reset() {
+ LOG.debug("{}: clearing clients {}", shardName, clients);
clients.clear();
}
@Override
void doApplySnapshot(final FrontendShardDataTreeSnapshotMetadata snapshot) {
clients.clear();
}
@Override
void doApplySnapshot(final FrontendShardDataTreeSnapshotMetadata snapshot) {
+ LOG.debug("{}: applying snapshot {} over clients {}", shardName, snapshot, clients);
clients.clear();
for (FrontendClientMetadata m : snapshot.getClients()) {
clients.clear();
for (FrontendClientMetadata m : snapshot.getClients()) {
- clients.put(m.getIdentifier().getFrontendId(), new FrontendClientMetadataBuilder(m));
+ LOG.debug("{}: applying metadata {}", shardName, m);
+ final FrontendClientMetadataBuilder b = new FrontendClientMetadataBuilder(m);
+ final FrontendIdentifier client = m.getIdentifier().getFrontendId();
+
+ LOG.debug("{}: client {} updated to {}", shardName, client, b);
+ clients.put(client, b);
}
}
}
}
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardDataTree.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardDataTree.java
index 20cee65c37ca50e62baf09cd3c4db25539242f8c..dffb69c36d3969c1bca35f9f6c5146c50ca1cf7f 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardDataTree.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardDataTree.java
@@
-409,12
+409,6
@@
public class ShardDataTree extends ShardDataTreeTransactionParent {
} else {
allMetadataClosedLocalHistory(((CloseLocalHistoryPayload) payload).getIdentifier());
}
} else {
allMetadataClosedLocalHistory(((CloseLocalHistoryPayload) payload).getIdentifier());
}
- } else if (payload instanceof CloseLocalHistoryPayload) {
- if (identifier != null) {
- payloadReplicationComplete((CloseLocalHistoryPayload) payload);
- } else {
- allMetadataClosedLocalHistory(((CloseLocalHistoryPayload) payload).getIdentifier());
- }
} else if (payload instanceof CreateLocalHistoryPayload) {
if (identifier != null) {
payloadReplicationComplete((CreateLocalHistoryPayload)payload);
} else if (payload instanceof CreateLocalHistoryPayload) {
if (identifier != null) {
payloadReplicationComplete((CreateLocalHistoryPayload)payload);
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardSnapshotCohort.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardSnapshotCohort.java
index 93e1d873579f0c02446b666f897cfcae640db525..c8f62e2a124817a156c8fa3ef434a7fbe373bf41 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardSnapshotCohort.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardSnapshotCohort.java
@@
-65,7
+65,10
@@
class ShardSnapshotCohort implements RaftActorSnapshotCohort {
@Override
public void createSnapshot(final ActorRef actorRef, final Optional<OutputStream> installSnapshotStream) {
// Forward the request to the snapshot actor
@Override
public void createSnapshot(final ActorRef actorRef, final Optional<OutputStream> installSnapshotStream) {
// Forward the request to the snapshot actor
- ShardSnapshotActor.requestSnapshot(snapshotActor, store.takeStateSnapshot(), installSnapshotStream, actorRef);
+ final ShardDataTreeSnapshot snapshot = store.takeStateSnapshot();
+ log.debug("{}: requesting serialization of snapshot {}", logId, snapshot);
+
+ ShardSnapshotActor.requestSnapshot(snapshotActor, snapshot, installSnapshotStream, actorRef);
}
@Override
}
@Override
@@
-94,7
+97,7
@@
class ShardSnapshotCohort implements RaftActorSnapshotCohort {
}
@Override
}
@Override
- public State deserializeSnapshot(ByteSource snapshotBytes) throws IOException {
+ public State deserializeSnapshot(
final
ByteSource snapshotBytes) throws IOException {
try (final ObjectInputStream in = new ObjectInputStream(snapshotBytes.openStream())) {
return new ShardSnapshotState(ShardDataTreeSnapshot.deserialize(in));
}
try (final ObjectInputStream in = new ObjectInputStream(snapshotBytes.openStream())) {
return new ShardSnapshotState(ShardDataTreeSnapshot.deserialize(in));
}
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/FrontendClientMetadata.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/FrontendClientMetadata.java
index 91c81edea4bb2ed67c86464cbaa3fd24f737c963..48f0a1eb13ee3ea6eac03099ccaae8b27c644104 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/FrontendClientMetadata.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/FrontendClientMetadata.java
@@
-91,7
+91,7
@@
public final class FrontendClientMetadata implements Identifiable<ClientIdentifi
@Override
public String toString() {
@Override
public String toString() {
- return MoreObjects.toStringHelper(FrontendClientMetadata.class).add("
Identifi
er", identifier)
- .add("
CurrentHistory", currentHistories).add("Range
", purgedHistories).toString();
+ return MoreObjects.toStringHelper(FrontendClientMetadata.class).add("
identif
er", identifier)
+ .add("
current", currentHistories).add("purged
", purgedHistories).toString();
}
}
}
}
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/FrontendHistoryMetadata.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/FrontendHistoryMetadata.java
index 5429fd19122f01ec574cd27fe7c5f7a30cfacae1..2cdda9f54716b41924e94a59cfb73c18110a1f12 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/FrontendHistoryMetadata.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/FrontendHistoryMetadata.java
@@
-111,7
+111,7
@@
public final class FrontendHistoryMetadata implements WritableObject {
@Override
public String toString() {
@Override
public String toString() {
- return MoreObjects.toStringHelper(FrontendHistoryMetadata.class).add("histor
i
Id", historyId)
+ return MoreObjects.toStringHelper(FrontendHistoryMetadata.class).add("histor
y
Id", historyId)
.add("cookie", cookie).add("closed", closed).add("closedTransactions", closedTransactions)
.add("purgedTransactions", purgedTransactions).toString();
}
.add("cookie", cookie).add("closed", closed).add("closedTransactions", closedTransactions)
.add("purgedTransactions", purgedTransactions).toString();
}
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/MetadataShardDataTreeSnapshot.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/MetadataShardDataTreeSnapshot.java
index 5cabd7122e5884efd0435887c1fc0dd50d9c41a5..05dc4cc3982268003be9c0d17f4a2bce2708ac1e 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/MetadataShardDataTreeSnapshot.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/MetadataShardDataTreeSnapshot.java
@@
-8,6
+8,7
@@
package org.opendaylight.controller.cluster.datastore.persisted;
import com.google.common.annotations.Beta;
package org.opendaylight.controller.cluster.datastore.persisted;
import com.google.common.annotations.Beta;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Preconditions;
import com.google.common.base.Verify;
import com.google.common.collect.ImmutableMap;
import com.google.common.base.Preconditions;
import com.google.common.base.Verify;
import com.google.common.collect.ImmutableMap;
@@
-125,4
+126,8
@@
public final class MetadataShardDataTreeSnapshot extends AbstractVersionedShardD
return new Proxy(this);
}
return new Proxy(this);
}
+ @Override
+ public String toString() {
+ return MoreObjects.toStringHelper(this).add("metadata", metadata).toString();
+ }
}
}