Repository: samza Updated Branches: refs/heads/master a706adda8 -> 2a9e729ad
Fix loadDefaults error msg. SAMZA-1744 Author: Boris S <[email protected]> Author: Boris Shkolnik <[email protected]> Reviewers: Xinyu Liu <[email protected]> Closes #551 from sborya/loadDefaultsErrorMsg and squashes the following commits: c3003ad2 [Boris S] Fixed error message 0edf343b [Boris S] Merge branch 'master' of https://github.com/apache/samza 67e611ee [Boris S] Merge branch 'master' of https://github.com/apache/samza dd39d089 [Boris S] Merge branch 'master' of https://github.com/apache/samza 1ad58d43 [Boris S] Merge branch 'master' of https://github.com/apache/samza 06b1ac36 [Boris Shkolnik] Merge branch 'master' of https://github.com/sborya/samza 5e6f5fb5 [Boris Shkolnik] Merge branch 'master' of https://github.com/apache/samza 010fa168 [Boris S] Merge branch 'master' of https://github.com/apache/samza bbffb79b [Boris S] Merge branch 'master' of https://github.com/apache/samza d4620d66 [Boris S] Merge branch 'master' of https://github.com/apache/samza 410ce78b [Boris S] Merge branch 'master' of https://github.com/apache/samza a31a7aa2 [Boris Shkolnik] reduce debugging from info to debug in KafkaCheckpointManager.java Project: http://git-wip-us.apache.org/repos/asf/samza/repo Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/2a9e729a Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/2a9e729a Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/2a9e729a Branch: refs/heads/master Commit: 2a9e729ad4fbfb69cd8cf1446589a04580bf79ae Parents: a706add Author: Boris S <[email protected]> Authored: Fri Jun 8 14:25:27 2018 -0700 Committer: Boris S <[email protected]> Committed: Fri Jun 8 14:25:27 2018 -0700 ---------------------------------------------------------------------- .../main/scala/org/apache/samza/checkpoint/OffsetManager.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/samza/blob/2a9e729a/samza-core/src/main/scala/org/apache/samza/checkpoint/OffsetManager.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/checkpoint/OffsetManager.scala b/samza-core/src/main/scala/org/apache/samza/checkpoint/OffsetManager.scala index ba2dfd9..53d5e98 100644 --- a/samza-core/src/main/scala/org/apache/samza/checkpoint/OffsetManager.scala +++ b/samza-core/src/main/scala/org/apache/samza/checkpoint/OffsetManager.scala @@ -412,8 +412,8 @@ class OffsetManager( val taskNameToSSPs: Map[TaskName, Set[SystemStreamPartition]] = systemStreamPartitions taskNameToSSPs.foreach { - case (taskName, systemStreamPartitions) => { - systemStreamPartitions.foreach { systemStreamPartition => + case (taskName, systemStreamPartitionsSet) => { + systemStreamPartitionsSet.foreach { systemStreamPartition => if (!startingOffsets.contains(taskName) || !startingOffsets(taskName).contains(systemStreamPartition)) { val systemStream = systemStreamPartition.getSystemStream val partition = systemStreamPartition.getPartition @@ -445,7 +445,7 @@ class OffsetManager( } } else { - throw new SamzaException("No metadata available for partition %s." format systemStreamPartitionMetadata) + throw new SamzaException("No metadata available for partition %s." format systemStreamPartition) } } }
