Repository: asterixdb Updated Branches: refs/heads/master f3e4397b3 -> b0c5c98b6
[NO ISSUE][OTR] Logging Cleanup - user model changes: no - storage format changes: no - interface changes: no Details: - No pretty printing for replica status. - Log ignored exception in debug level. Change-Id: I7e4a37e9621ef5bdb27105b17e883800212e594b Reviewed-on: https://asterix-gerrit.ics.uci.edu/2276 Sonar-Qube: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> Reviewed-by: Ian Maxon <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/b0c5c98b Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/b0c5c98b Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/b0c5c98b Branch: refs/heads/master Commit: b0c5c98b66d27d4f19aaf6a70a3f055f241f69c1 Parents: f3e4397 Author: Murtadha Hubail <[email protected]> Authored: Mon Jan 15 19:59:11 2018 +0300 Committer: Michael Blow <[email protected]> Committed: Mon Jan 15 18:35:47 2018 -0800 ---------------------------------------------------------------------- .../org/apache/asterix/replication/api/PartitionReplica.java | 4 ++-- .../am/common/dataflow/IndexDropOperatorNodePushable.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/b0c5c98b/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/api/PartitionReplica.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/api/PartitionReplica.java b/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/api/PartitionReplica.java index f752745..d3ddc43 100644 --- a/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/api/PartitionReplica.java +++ b/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/api/PartitionReplica.java @@ -128,7 +128,7 @@ public class PartitionReplica implements IPartitionReplica { private JsonNode asJson() { ObjectNode json = OBJECT_MAPPER.createObjectNode(); json.put("id", id.toString()); - json.put("state", status.name()); + json.put("status", status.name()); return json; } @@ -152,7 +152,7 @@ public class PartitionReplica implements IPartitionReplica { @Override public String toString() { try { - return JSONUtil.convertNode(asJson()); + return OBJECT_MAPPER.writeValueAsString(asJson()); } catch (JsonProcessingException e) { throw new ReplicationException(e); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/b0c5c98b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexDropOperatorNodePushable.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexDropOperatorNodePushable.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexDropOperatorNodePushable.java index c59c1a8..f75144a 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexDropOperatorNodePushable.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexDropOperatorNodePushable.java @@ -83,7 +83,7 @@ public class IndexDropOperatorNodePushable extends AbstractOperatorNodePushable return; } catch (HyracksDataException e) { if (isIgnorable(e)) { - LOGGER.info("Ignoring exception on drop", e); + LOGGER.debug("Ignoring exception on drop", e); return; } if (canRetry(e)) {
