You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@omid.apache.org by fp...@apache.org on 2016/06/08 18:37:59 UTC
[07/14] incubator-omid git commit: Merge pull request #113 from
yahoo/omid-38
Merge pull request #113 from yahoo/omid-38
[OMID-38] Align and improve client/server configurations
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/19063a70
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/19063a70
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/19063a70
Branch: refs/heads/master
Commit: 19063a70b0fe9e76a6fdfacac4e675b2869983a7
Parents: 6c6b27c 5c1c0a4
Author: ikatkov <ik...@gmail.com>
Authored: Mon Jun 6 13:04:04 2016 -0700
Committer: ikatkov <ik...@gmail.com>
Committed: Mon Jun 6 13:04:04 2016 -0700
----------------------------------------------------------------------
.../main/java/org/apache/omid/NetworkUtils.java | 53 +++++++
.../apache/omid/transaction/OmidTestBase.java | 2 +-
.../TestEndToEndScenariosWithHA.java | 4 +-
.../apache/omid/transaction/TestCompaction.java | 2 +-
tso-server/bin/omid-env.sh | 27 ++++
tso-server/bin/omid.sh | 14 +-
tso-server/conf/bench.log4j.xml | 15 --
tso-server/conf/omid-env.sh | 27 ----
tso-server/conf/omid-server-configuration.yml | 8 +
tso-server/conf/omid.yml | 1 -
.../apache/omid/tso/RequestProcessorImpl.java | 2 +-
.../org/apache/omid/tso/TSOServerConfig.java | 47 ++----
.../default-omid-server-configuration.yml | 148 ++++++++++++++++++
tso-server/src/main/resources/default-omid.yml | 149 -------------------
.../apache/omid/tso/TestRequestProcessor.java | 3 +-
...tionOfTSOClientServerBasicFunctionality.java | 2 +-
.../client/TestTSOClientConnectionToTSO.java | 6 +-
...stTSOClientRequestAndResponseBehaviours.java | 2 +-
tso-server/src/test/resources/test-omid.yml | 5 +-
19 files changed, 265 insertions(+), 252 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/19063a70/tso-server/src/main/java/org/apache/omid/tso/RequestProcessorImpl.java
----------------------------------------------------------------------
diff --cc tso-server/src/main/java/org/apache/omid/tso/RequestProcessorImpl.java
index 808d43d,9b994cf..65416bc
--- a/tso-server/src/main/java/org/apache/omid/tso/RequestProcessorImpl.java
+++ b/tso-server/src/main/java/org/apache/omid/tso/RequestProcessorImpl.java
@@@ -89,10 -83,8 +89,10 @@@ class RequestProcessorImpl implements E
this.metrics = metrics;
this.persistProc = persistProc;
this.timestampOracle = timestampOracle;
- this.hashmap = new CommitHashMap(config.getMaxItems());
+ this.hashmap = new CommitHashMap(config.getConflictMapSize());
+ LOG.info("RequestProcessor initialized");
+
}
/**