You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@samza.apache.org by jm...@apache.org on 2018/01/17 22:27:05 UTC
samza git commit: SAMZA-1558: State restore metrics should be duplicated and deprecated…
Repository: samza
Updated Branches:
refs/heads/master 95a71fb9e -> b38e6622f
SAMZA-1558: State restore metrics should be duplicated and deprecated…
… to avoid type conflicts
Author: Jacob Maes <jm...@apache.org>
Reviewers: Prateek Maheshwari <pm...@linkedin.com>
Closes #407 from jmakes/samza-1558
Project: http://git-wip-us.apache.org/repos/asf/samza/repo
Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/b38e6622
Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/b38e6622
Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/b38e6622
Branch: refs/heads/master
Commit: b38e6622f0f96437c4809f314ac9a96c0d75de7d
Parents: 95a71fb
Author: Jacob Maes <jm...@apache.org>
Authored: Wed Jan 17 14:26:53 2018 -0800
Committer: Jacob Maes <--global>
Committed: Wed Jan 17 14:26:53 2018 -0800
----------------------------------------------------------------------
.../documentation/versioned/container/metrics-table.html | 8 ++++++++
.../apache/samza/storage/kv/KeyValueStorageEngine.scala | 10 +++++++---
.../samza/storage/kv/KeyValueStorageEngineMetrics.scala | 8 ++++++--
.../samza/storage/kv/TestKeyValueStorageEngine.scala | 6 +++---
4 files changed, 24 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/samza/blob/b38e6622/docs/learn/documentation/versioned/container/metrics-table.html
----------------------------------------------------------------------
diff --git a/docs/learn/documentation/versioned/container/metrics-table.html b/docs/learn/documentation/versioned/container/metrics-table.html
index e2f4e48..f35d597 100644
--- a/docs/learn/documentation/versioned/container/metrics-table.html
+++ b/docs/learn/documentation/versioned/container/metrics-table.html
@@ -659,10 +659,18 @@
</tr>
<tr>
<td><span class="store">store-name</span>-messages-restored</td>
+ <td>DEPRECATED: use <code>restored-messages</code> instead. Number of restored messages (key-value pairs) from the change log.</td>
+ </tr>
+ <tr>
+ <td><span class="store">store-name</span>-restored-messages</td>
<td>Number of restored messages (key-value pairs) from the change log</td>
</tr>
<tr>
<td><span class="store">store-name</span>-message-bytes</td>
+ <td>DEPRECATED: use <code>restored-bytes</code> instead. Total amount of bytes (key and value size) restored from the change log</td>
+ </tr>
+ <tr>
+ <td><span class="store">store-name</span>-restored-bytes</td>
<td>Total amount of bytes (key and value size) restored from the change log</td>
</tr>
http://git-wip-us.apache.org/repos/asf/samza/blob/b38e6622/samza-kv/src/main/scala/org/apache/samza/storage/kv/KeyValueStorageEngine.scala
----------------------------------------------------------------------
diff --git a/samza-kv/src/main/scala/org/apache/samza/storage/kv/KeyValueStorageEngine.scala b/samza-kv/src/main/scala/org/apache/samza/storage/kv/KeyValueStorageEngine.scala
index c42e043..373e18a 100644
--- a/samza-kv/src/main/scala/org/apache/samza/storage/kv/KeyValueStorageEngine.scala
+++ b/samza-kv/src/main/scala/org/apache/samza/storage/kv/KeyValueStorageEngine.scala
@@ -115,11 +115,15 @@ class KeyValueStorageEngine[K, V](
}
if (valBytes != null) {
- metrics.restoredBytes.set(metrics.restoredBytes.getValue + valBytes.size)
+ metrics.restoredBytes.inc(valBytes.size)
+ metrics.restoredBytesGauge.set(metrics.restoredBytesGauge.getValue + valBytes.size)
}
- metrics.restoredBytes.set(metrics.restoredBytes.getValue + keyBytes.size)
- metrics.restoredMessages.set(metrics.restoredMessages.getValue + 1)
+ metrics.restoredBytes.inc(keyBytes.size)
+ metrics.restoredBytesGauge.set(metrics.restoredBytesGauge.getValue + keyBytes.size)
+
+ metrics.restoredMessages.inc()
+ metrics.restoredMessagesGauge.set(metrics.restoredMessagesGauge.getValue + 1)
count += 1
if (count % 1000000 == 0) {
http://git-wip-us.apache.org/repos/asf/samza/blob/b38e6622/samza-kv/src/main/scala/org/apache/samza/storage/kv/KeyValueStorageEngineMetrics.scala
----------------------------------------------------------------------
diff --git a/samza-kv/src/main/scala/org/apache/samza/storage/kv/KeyValueStorageEngineMetrics.scala b/samza-kv/src/main/scala/org/apache/samza/storage/kv/KeyValueStorageEngineMetrics.scala
index f43b52e..8c42c7c 100644
--- a/samza-kv/src/main/scala/org/apache/samza/storage/kv/KeyValueStorageEngineMetrics.scala
+++ b/samza-kv/src/main/scala/org/apache/samza/storage/kv/KeyValueStorageEngineMetrics.scala
@@ -34,8 +34,12 @@ class KeyValueStorageEngineMetrics(
val deletes = newCounter("deletes")
val flushes = newCounter("flushes")
- val restoredMessages = newGauge("messages-restored", 0)
- val restoredBytes = newGauge("messages-bytes", 0)
+ val restoredMessages = newCounter("messages-restored") //Deprecated
+ val restoredMessagesGauge = newGauge("restored-messages", 0)
+
+ val restoredBytes = newCounter("messages-bytes") //Deprecated
+ val restoredBytesGauge = newGauge("restored-bytes", 0)
+
val getNs = newTimer("get-ns")
val putNs = newTimer("put-ns")
http://git-wip-us.apache.org/repos/asf/samza/blob/b38e6622/samza-kv/src/test/scala/org/apache/samza/storage/kv/TestKeyValueStorageEngine.scala
----------------------------------------------------------------------
diff --git a/samza-kv/src/test/scala/org/apache/samza/storage/kv/TestKeyValueStorageEngine.scala b/samza-kv/src/test/scala/org/apache/samza/storage/kv/TestKeyValueStorageEngine.scala
index ec714b2..f0c254f 100644
--- a/samza-kv/src/test/scala/org/apache/samza/storage/kv/TestKeyValueStorageEngine.scala
+++ b/samza-kv/src/test/scala/org/apache/samza/storage/kv/TestKeyValueStorageEngine.scala
@@ -141,10 +141,10 @@ class TestKeyValueStorageEngine {
engine.restore(changelogEntries.iterator())
- assertEquals(3, metrics.restoredMessages.getValue)
- assertEquals(15, metrics.restoredBytes.getValue) // 3 keys * 2 bytes/key + 3 msgs * 3 bytes/msg
+ assertEquals(3, metrics.restoredMessagesGauge.getValue)
+ assertEquals(15, metrics.restoredBytesGauge.getValue) // 3 keys * 2 bytes/key + 3 msgs * 3 bytes/msg
}
-
+
def getNextTimestamp(): Long = {
now += 1
now