Repository: incubator-s2graph Updated Branches: refs/heads/master e8ec7408e -> 2362a84d1
[S2GRAPH-37]: Extract LockExpireDuration as configuration. Extract LockExpireDuration as configuration. note that default value for lock.expire.time = 600 secs. lock.expire.time > 2 * max.retry.number * max.back.off JIRA: [S2GRAPH-37] https://issues.apache.org/jira/browse/S2GRAPH-37 Pull Request: Closes #20 Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/2362a84d Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/2362a84d Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/2362a84d Branch: refs/heads/master Commit: 2362a84d1241f49095e74f2fe92512f0988422ca Parents: e8ec740 Author: DO YUNG YOON <[email protected]> Authored: Tue Feb 23 16:34:05 2016 +0900 Committer: DO YUNG YOON <[email protected]> Committed: Tue Feb 23 16:34:05 2016 +0900 ---------------------------------------------------------------------- CHANGES | 2 ++ s2core/src/main/scala/com/kakao/s2graph/core/Graph.scala | 1 + .../com/kakao/s2graph/core/storage/hbase/AsynchbaseStorage.scala | 2 +- s2rest_play/conf/reference.conf | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/2362a84d/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 74c2bc8..9fef99d 100644 --- a/CHANGES +++ b/CHANGES @@ -20,6 +20,8 @@ Release 0.12.1 - unreleased S2GRAPH-16: Performance tunning on where parser (Committed by DOYUNG YOON). + S2GRAPH-37: Extract LockExpireDuration as configuration (Committed by DOYUNG YOON). + BUG FIXES S2GRAPH-18: Query Option "interval" is Broken. http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/2362a84d/s2core/src/main/scala/com/kakao/s2graph/core/Graph.scala ---------------------------------------------------------------------- diff --git a/s2core/src/main/scala/com/kakao/s2graph/core/Graph.scala b/s2core/src/main/scala/com/kakao/s2graph/core/Graph.scala index bb286c3..75659c1 100644 --- a/s2core/src/main/scala/com/kakao/s2graph/core/Graph.scala +++ b/s2core/src/main/scala/com/kakao/s2graph/core/Graph.scala @@ -36,6 +36,7 @@ object Graph { "hbase.rpcs.buffered_flush_interval" -> java.lang.Short.valueOf(100.toShort), "hbase.rpc.timeout" -> java.lang.Integer.valueOf(1000), "max.retry.number" -> java.lang.Integer.valueOf(100), + "lock.expire.time" -> java.lang.Integer.valueOf(1000 * 60 * 10), "max.back.off" -> java.lang.Integer.valueOf(100), "hbase.fail.prob" -> java.lang.Double.valueOf(-0.1), "delete.all.fetch.size" -> java.lang.Integer.valueOf(1000), http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/2362a84d/s2core/src/main/scala/com/kakao/s2graph/core/storage/hbase/AsynchbaseStorage.scala ---------------------------------------------------------------------- diff --git a/s2core/src/main/scala/com/kakao/s2graph/core/storage/hbase/AsynchbaseStorage.scala b/s2core/src/main/scala/com/kakao/s2graph/core/storage/hbase/AsynchbaseStorage.scala index 019b2bc..edc2780 100644 --- a/s2core/src/main/scala/com/kakao/s2graph/core/storage/hbase/AsynchbaseStorage.scala +++ b/s2core/src/main/scala/com/kakao/s2graph/core/storage/hbase/AsynchbaseStorage.scala @@ -77,7 +77,7 @@ class AsynchbaseStorage(override val config: Config, vertexCache: Cache[Integer, val MaxBackOff = config.getInt("max.back.off") val DeleteAllFetchSize = config.getInt("delete.all.fetch.size") val FailProb = config.getDouble("hbase.fail.prob") - val LockExpireDuration = Math.max(MaxRetryNum * MaxBackOff * 2, 10000) + val LockExpireDuration = config.getInt("lock.expire.time") /** * Serializer/Deserializer http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/2362a84d/s2rest_play/conf/reference.conf ---------------------------------------------------------------------- diff --git a/s2rest_play/conf/reference.conf b/s2rest_play/conf/reference.conf index a992e5d..6e76847 100644 --- a/s2rest_play/conf/reference.conf +++ b/s2rest_play/conf/reference.conf @@ -108,7 +108,7 @@ max.retry.number=100 max.back.off=50 delete.all.fetch.size=10000 hbase.fail.prob=-1.0 - +lock.expire.time=600000 # max allowd edges for deleteAll is multiply of above two configuration. # set global obejct package, TODO: remove global
