Updated Branches: refs/heads/develop 964b28ccd -> 2aa3f515f
added configuration defaults and descriptions for clustering Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/2aa3f515 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/2aa3f515 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/2aa3f515 Branch: refs/heads/develop Commit: 2aa3f515f6276f47c9e38467c945237485f2d8ad Parents: 964b28c Author: Sebastian Schaffert <[email protected]> Authored: Wed Feb 12 18:17:50 2014 +0100 Committer: Sebastian Schaffert <[email protected]> Committed: Wed Feb 12 18:17:50 2014 +0100 ---------------------------------------------------------------------- .../src/main/resources/config-defaults.properties | 3 +++ .../main/resources/config-descriptions.properties | 17 ++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/2aa3f515/platform/marmotta-core/src/main/resources/config-defaults.properties ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/resources/config-defaults.properties b/platform/marmotta-core/src/main/resources/config-defaults.properties index b5b67b6..4ac724d 100644 --- a/platform/marmotta-core/src/main/resources/config-defaults.properties +++ b/platform/marmotta-core/src/main/resources/config-defaults.properties @@ -206,3 +206,6 @@ contexts.inferred = ${kiwi.context}context/inferred # Turn on cluster-specific configuration options (e.g. replicated and distributed caching, synchronization, ...) clustering.enabled = false clustering.name = Marmotta +clustering.mode = REPLICATED +clustering.address = 228.6.7.8 +clustering.port = 46655 http://git-wip-us.apache.org/repos/asf/marmotta/blob/2aa3f515/platform/marmotta-core/src/main/resources/config-descriptions.properties ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/resources/config-descriptions.properties b/platform/marmotta-core/src/main/resources/config-descriptions.properties index 0654931..0599619 100644 --- a/platform/marmotta-core/src/main/resources/config-descriptions.properties +++ b/platform/marmotta-core/src/main/resources/config-descriptions.properties @@ -166,7 +166,22 @@ clustering.enabled.type = java.lang.Boolean clustering.name.description = Cluster name to use in cluster configuration (e.g. cache cluster name) clustering.name.type = java.lang.String - +clustering.mode.description = Set the cache mode for this KiWi triple store. The following cluster modes are available: \ + LOCAL: In local cache mode, the cache is not shared among the servers in a cluster. Each machine keeps a local cache. \ + This allows quick startups and eliminates network traffic in the cluster, but subsequent requests to different \ + cluster members cannot benefit from the cached data. \ + DISTRIBUTED: In distributed cache mode, the cluster forms a big hash table used as a cache. This allows to make efficient \ + use of the large amount of memory available, but requires cache rebalancing and a lot of network transfers, \ + especially in case cluster members are restarted often. \ + REPLICATED: In replicated cache mode, each node in the cluster has an identical copy of all cache data. This allows \ + very efficient cache lookups and reduces the rebalancing effort, but requires more memory. +clustering.mode.type = java.lang.Enum("LOCAL"|"DISTRIBUTED"|"REPLICATED") + +clustering.address.description = Set the address used for sending UDP multicast packages in the cluster +clustering.address.type = java.lang.String + +clustering.port.description = Set the port used for sending UDP multicast packages in the cluster +clustering.port.type = java.lang.Integer(1|1024|65535) contexts.default.description = Default context to use for triples in case no explicit context selected (may be empty) contexts.default.type = java.lang.String
