Repository: samza Updated Branches: refs/heads/master c1ea1fda7 -> 94951bc81
SAMZA-1802: Enable host affinity when RocksDB is present We should enable host affinity when RocksDB table is present, this should be done in RocksDB table provider. Author: Wei Song <[email protected]> Reviewers: Prateek Maheshwari <[email protected]> Closes #600 from weisong44/add-host-affinity and squashes the following commits: 78e1b84a [Wei Song] Enable host affinity in RocksDB table provider a15a7c9a [Wei Song] Merge remote-tracking branch 'upstream/master' 5cbf9af9 [Wei Song] Merge remote-tracking branch 'upstream/master' 3f7ed71f [Wei Song] Added self to committer list Project: http://git-wip-us.apache.org/repos/asf/samza/repo Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/94951bc8 Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/94951bc8 Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/94951bc8 Branch: refs/heads/master Commit: 94951bc815fee439a737562fe13c46aef098f29e Parents: c1ea1fd Author: Wei Song <[email protected]> Authored: Tue Aug 7 10:13:01 2018 -0700 Committer: Wei Song <[email protected]> Committed: Tue Aug 7 10:13:01 2018 -0700 ---------------------------------------------------------------------- .../java/org/apache/samza/storage/kv/RocksDbTableProvider.java | 4 ++++ .../apache/samza/test/table/TestTableDescriptorsProvider.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/samza/blob/94951bc8/samza-kv-rocksdb/src/main/java/org/apache/samza/storage/kv/RocksDbTableProvider.java ---------------------------------------------------------------------- diff --git a/samza-kv-rocksdb/src/main/java/org/apache/samza/storage/kv/RocksDbTableProvider.java b/samza-kv-rocksdb/src/main/java/org/apache/samza/storage/kv/RocksDbTableProvider.java index eb8188f..dce7cc0 100644 --- a/samza-kv-rocksdb/src/main/java/org/apache/samza/storage/kv/RocksDbTableProvider.java +++ b/samza-kv-rocksdb/src/main/java/org/apache/samza/storage/kv/RocksDbTableProvider.java @@ -21,6 +21,7 @@ package org.apache.samza.storage.kv; import java.util.HashMap; import java.util.Map; +import org.apache.samza.config.ClusterManagerConfig; import org.apache.samza.config.JavaTableConfig; import org.apache.samza.config.StorageConfig; import org.apache.samza.table.TableSpec; @@ -56,6 +57,9 @@ public class RocksDbTableProvider extends BaseLocalStoreBackedTableProvider { tableConfig.put(realKey, v); }); + // Enable host affinity + tableConfig.put(ClusterManagerConfig.CLUSTER_MANAGER_HOST_AFFINITY_ENABLED, "true"); + logger.info("Generated configuration for table " + tableSpec.getId()); return tableConfig; http://git-wip-us.apache.org/repos/asf/samza/blob/94951bc8/samza-test/src/test/java/org/apache/samza/test/table/TestTableDescriptorsProvider.java ---------------------------------------------------------------------- diff --git a/samza-test/src/test/java/org/apache/samza/test/table/TestTableDescriptorsProvider.java b/samza-test/src/test/java/org/apache/samza/test/table/TestTableDescriptorsProvider.java index 3ed29ca..817fb9f 100644 --- a/samza-test/src/test/java/org/apache/samza/test/table/TestTableDescriptorsProvider.java +++ b/samza-test/src/test/java/org/apache/samza/test/table/TestTableDescriptorsProvider.java @@ -81,7 +81,7 @@ public class TestTableDescriptorsProvider { String tableRewriterName = "tableRewriter"; configs.put("tables.descriptors.provider.class", MySampleTableDescriptorsProvider.class.getName()); Config resultConfig = new MySampleTableConfigRewriter().rewrite(tableRewriterName, new MapConfig(configs)); - Assert.assertTrue(resultConfig.size() == 17); + Assert.assertTrue(resultConfig.size() == 18); String localTableId = "local-table-1"; String remoteTableId = "remote-table-1";
