You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2016/01/11 19:54:45 UTC
[1/3] storm git commit: improve debug logs
Repository: storm
Updated Branches:
refs/heads/master b6c0c4071 -> 08967889e
improve debug logs
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3193d405
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3193d405
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3193d405
Branch: refs/heads/master
Commit: 3193d405d3452d2a3ae68bd83f6043c969b4922e
Parents: b7ba063
Author: Xin Wang <be...@163.com>
Authored: Fri Dec 25 15:22:28 2015 +0800
Committer: vesense <be...@163.com>
Committed: Tue Dec 29 11:34:10 2015 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/storm/hbase/bolt/HBaseBolt.java | 2 +-
.../src/main/java/org/apache/storm/hive/bolt/HiveBolt.java | 2 +-
.../storm-kafka/src/jvm/storm/kafka/PartitionManager.java | 8 ++++----
external/storm-kafka/src/jvm/storm/kafka/ZkState.java | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/3193d405/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseBolt.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseBolt.java
index ea17b2c..5453087 100644
--- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseBolt.java
+++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseBolt.java
@@ -95,7 +95,7 @@ public class HBaseBolt extends AbstractHBaseBolt {
boolean flush = false;
try {
if (TupleUtils.isTick(tuple)) {
- LOG.debug("TICK received! current batch status [" + tupleBatch.size() + "/" + batchSize + "]");
+ LOG.debug("TICK received! current batch status [{}/{}]", tupleBatch.size(), batchSize);
flush = true;
} else {
byte[] rowKey = this.mapper.rowKey(tuple);
http://git-wip-us.apache.org/repos/asf/storm/blob/3193d405/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java b/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java
index d8685b0..97a8c48 100644
--- a/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java
+++ b/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java
@@ -112,7 +112,7 @@ public class HiveBolt extends BaseRichBolt {
try {
boolean forceFlush = false;
if (TupleUtils.isTick(tuple)) {
- LOG.debug("TICK received! current batch status [" + tupleBatch.size() + "/" + options.getBatchSize() + "]");
+ LOG.debug("TICK received! current batch status [{}/{}]", tupleBatch.size(), options.getBatchSize());
forceFlush = true;
}
else {
http://git-wip-us.apache.org/repos/asf/storm/blob/3193d405/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java b/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
index d1b9f48..77e5be4 100644
--- a/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
+++ b/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
@@ -251,7 +251,7 @@ public class PartitionManager {
" behind _emittedToOffset=" + _emittedToOffset
);
} else {
- LOG.debug("failing at offset=" + offset + " with _pending.size()=" + _pending.size() + " pending and _emittedToOffset=" + _emittedToOffset);
+ LOG.debug("failing at offset={} with _pending.size()={} pending and _emittedToOffset={}", offset, _pending.size(), _emittedToOffset);
numberFailed++;
if (numberAcked == 0 && numberFailed > _spoutConfig.maxOffsetBehind) {
throw new RuntimeException("Too many tuple failures");
@@ -264,7 +264,7 @@ public class PartitionManager {
public void commit() {
long lastCompletedOffset = lastCompletedOffset();
if (_committedTo != lastCompletedOffset) {
- LOG.debug("Writing last completed offset (" + lastCompletedOffset + ") to ZK for " + _partition + " for topology: " + _topologyInstanceId);
+ LOG.debug("Writing last completed offset ({}) to ZK for {} for topology: {}", lastCompletedOffset, _partition, _topologyInstanceId);
Map<Object, Object> data = (Map<Object, Object>) ImmutableMap.builder()
.put("topology", ImmutableMap.of("id", _topologyInstanceId,
"name", _stormConf.get(Config.TOPOLOGY_NAME)))
@@ -276,9 +276,9 @@ public class PartitionManager {
_state.writeJSON(committedPath(), data);
_committedTo = lastCompletedOffset;
- LOG.debug("Wrote last completed offset (" + lastCompletedOffset + ") to ZK for " + _partition + " for topology: " + _topologyInstanceId);
+ LOG.debug("Wrote last completed offset ({}) to ZK for {} for topology: {}", lastCompletedOffset, _partition, _topologyInstanceId);
} else {
- LOG.debug("No new offset for " + _partition + " for topology: " + _topologyInstanceId);
+ LOG.debug("No new offset for {} for topology: {}", _partition, _topologyInstanceId);
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/3193d405/external/storm-kafka/src/jvm/storm/kafka/ZkState.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/storm/kafka/ZkState.java b/external/storm-kafka/src/jvm/storm/kafka/ZkState.java
index 75cbb24..e5e67e5 100644
--- a/external/storm-kafka/src/jvm/storm/kafka/ZkState.java
+++ b/external/storm-kafka/src/jvm/storm/kafka/ZkState.java
@@ -66,7 +66,7 @@ public class ZkState {
}
public void writeJSON(String path, Map<Object, Object> data) {
- LOG.debug("Writing " + path + " the data " + data.toString());
+ LOG.debug("Writing {} the data {}", path, data.toString());
writeBytes(path, JSONValue.toJSONString(data).getBytes(Charset.forName("UTF-8")));
}
[2/3] storm git commit: Merge branch 'patch-22' of
https://github.com/vesense/storm into STORM-1418
Posted by bo...@apache.org.
Merge branch 'patch-22' of https://github.com/vesense/storm into STORM-1418
Conflicts:
external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseBolt.java
external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java
STORM-1418: improve debug logs for some external modules
This closes #976
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/55f11d46
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/55f11d46
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/55f11d46
Branch: refs/heads/master
Commit: 55f11d46f204a277135f19eda57251ea87c22ccc
Parents: b6c0c40 3193d40
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Mon Jan 11 12:53:29 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Mon Jan 11 12:53:29 2016 -0600
----------------------------------------------------------------------
.../src/main/java/org/apache/storm/hbase/bolt/HBaseBolt.java | 2 +-
.../src/main/java/org/apache/storm/hive/bolt/HiveBolt.java | 2 +-
.../storm-kafka/src/jvm/storm/kafka/PartitionManager.java | 8 ++++----
external/storm-kafka/src/jvm/storm/kafka/ZkState.java | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/55f11d46/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseBolt.java
----------------------------------------------------------------------
diff --cc external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseBolt.java
index c215b2d,5453087..4413361
--- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseBolt.java
+++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseBolt.java
@@@ -95,8 -95,7 +95,8 @@@ public class HBaseBolt extends Abstrac
boolean flush = false;
try {
if (TupleUtils.isTick(tuple)) {
- LOG.debug("TICK received! current batch status [" + tupleBatch.size() + "/" + batchSize + "]");
+ LOG.debug("TICK received! current batch status [{}/{}]", tupleBatch.size(), batchSize);
+ collector.ack(tuple);
flush = true;
} else {
byte[] rowKey = this.mapper.rowKey(tuple);
http://git-wip-us.apache.org/repos/asf/storm/blob/55f11d46/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java
----------------------------------------------------------------------
diff --cc external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java
index 73ad605,97a8c48..14788b5
--- a/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java
+++ b/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java
@@@ -112,8 -112,7 +112,8 @@@ public class HiveBolt extends BaseRich
try {
boolean forceFlush = false;
if (TupleUtils.isTick(tuple)) {
- LOG.debug("TICK received! current batch status [" + tupleBatch.size() + "/" + options.getBatchSize() + "]");
+ LOG.debug("TICK received! current batch status [{}/{}]", tupleBatch.size(), options.getBatchSize());
+ collector.ack(tuple);
forceFlush = true;
}
else {
http://git-wip-us.apache.org/repos/asf/storm/blob/55f11d46/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
----------------------------------------------------------------------
[3/3] storm git commit: Added STORM-1418 to Changelog
Posted by bo...@apache.org.
Added STORM-1418 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/08967889
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/08967889
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/08967889
Branch: refs/heads/master
Commit: 08967889e6a47a33c7b36901b94b8e076278cd5f
Parents: 55f11d4
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Mon Jan 11 12:54:08 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Mon Jan 11 12:54:08 2016 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/08967889/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c6b463..c3a8513 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-1418: improve debug logs for some external modules
* STORM-1415: Some improvements for trident map StateUpdater
* STORM-1414: Some improvements for multilang JsonSerializer
* STORM-1408: clean up the build directory created by tests