Cleanup duplicate configurations and add datacenter options to cql co…

…nfiguration for better visibility

Signed-off-by: Oleksandr Porunov <[email protected]>

janusgraph-dist/src/assembly/cfilter/conf/janusgraph-cql-configurationgraph.properties

@@ -12,85 +12,29 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# JanusGraph configuration sample: Cassandra over a socket
+# JanusGraph configuration sample: Cassandra over a socket with `ConfiguredGraphFactory` which allows to dynamically
+# create and open multiple graphs.
 #
 # This file connects to a Cassandra daemon running on localhost via
 # CQL.  Cassandra must already be started before starting JanusGraph
 # with this file.
 
-gremlin.graph=org.janusgraph.core.ConfiguredGraphFactory
+#JANUSGRAPHCFG{gremlin.graph=org.janusgraph.core.ConfiguredGraphFactory}
 
-# The primary persistence provider used by JanusGraph.  This is required. 
-# It should be set one of JanusGraph's built-in shorthand names for its
-# standard storage backends (shorthands: berkeleyje, cql, hbase, inmemory) 
-# or to the full package and classname of a custom/third-party StoreManager
-# implementation.
-#
-# Default:    (no default value)
-# Data Type:  String
-# Mutability: LOCAL
-storage.backend=cql
+#JANUSGRAPHCFG{storage.backend=cql}
 
 # The configuration management graph reserved for use with JanusGraphManager
 # and ConfiguredGraphFactory
-graph.graphname=ConfigurationManagementGraph
-# The hostname or comma-separated list of hostnames of storage backend
-# servers.  This is only applicable to some storage backends, such as
-# cassandra and hbase.
-#
-# Default:    127.0.0.1
-# Data Type:  class java.lang.String[]
-# Mutability: LOCAL
-storage.hostname=127.0.0.1
+#JANUSGRAPHCFG{graph.graphname=ConfigurationManagementGraph}
 
-# Whether to enable JanusGraph's database-level cache, which is shared
-# across all transactions. Enabling this option speeds up traversals by
-# holding hot graph elements in memory, but also increases the likelihood
-# of reading stale data.  Disabling it forces each transaction to
-# independently fetch graph elements from storage before reading/writing
-# them.
-#
-# Default:    false
-# Data Type:  Boolean
-# Mutability: MASKABLE
-cache.db-cache = true
+#JANUSGRAPHCFG{storage.hostname=127.0.0.1}
 
-# How long, in milliseconds, database-level cache will keep entries after
-# flushing them.  This option is only useful on distributed storage
-# backends that are capable of acknowledging writes without necessarily
-# making them immediately visible.
-#
-# Default:    50
-# Data Type:  Integer
-# Mutability: GLOBAL_OFFLINE
-#
-# Settings with mutability GLOBAL_OFFLINE are centrally managed in
-# JanusGraph's storage backend.  After starting the database for the first
-# time, this file's copy of this setting is ignored.  Use JanusGraph's
-# Management System to read or modify this value after bootstrapping.
-cache.db-cache-clean-wait = 20
+#JANUSGRAPHCFG{storage.cql.local-datacenter=datacenter1}
 
-# Default expiration time, in milliseconds, for entries in the
-# database-level cache. Entries are evicted when they reach this age even
-# if the cache has room to spare. Set to 0 to disable expiration (cache
-# entries live forever or until memory pressure triggers eviction when set
-# to 0).
-#
-# Default:    10000
-# Data Type:  Long
-# Mutability: GLOBAL_OFFLINE
-#
-# Settings with mutability GLOBAL_OFFLINE are centrally managed in
-# JanusGraph's storage backend.  After starting the database for the first
-# time, this file's copy of this setting is ignored.  Use JanusGraph's
-# Management System to read or modify this value after bootstrapping.
-cache.db-cache-time = 180000
+#JANUSGRAPHCFG{cache.db-cache = true}
 
-# Size of JanusGraph's database level cache.  Values between 0 and 1 are
-# interpreted as a percentage of VM heap, while larger values are
-# interpreted as an absolute size in bytes.
-#
-# Default:    0.3
-# Data Type:  Double
-# Mutability: MASKABLE
-cache.db-cache-size = 0.5
+#JANUSGRAPHCFG{cache.db-cache-clean-wait = 20}
+
+#JANUSGRAPHCFG{cache.db-cache-time = 180000}
+
+#JANUSGRAPHCFG{cache.db-cache-size = 0.5}

janusgraph-dist/src/assembly/cfilter/conf/janusgraph-cql-es.properties

@@ -28,6 +28,8 @@
 
 #JANUSGRAPHCFG{storage.cql.keyspace=janusgraph}
 
+#JANUSGRAPHCFG{storage.cql.local-datacenter=datacenter1}
+
 #JANUSGRAPHCFG{cache.db-cache = true}
 
 #JANUSGRAPHCFG{cache.db-cache-clean-wait = 20}

janusgraph-dist/src/assembly/cfilter/conf/janusgraph-cql-solr.properties

@@ -27,6 +27,8 @@
 
 #JANUSGRAPHCFG{storage.cql.keyspace=janusgraph}
 
+#JANUSGRAPHCFG{storage.cql.local-datacenter=datacenter1}
+
 #JANUSGRAPHCFG{cache.db-cache = true}
 
 #JANUSGRAPHCFG{cache.db-cache-clean-wait = 20}

janusgraph-dist/src/assembly/cfilter/conf/janusgraph-cql.properties

@@ -15,7 +15,7 @@
 # JanusGraph configuration sample: Cassandra over a socket
 #
 # This file connects to a Cassandra daemon running on localhost via
-# Thrift.  Cassandra must already be started before starting JanusGraph
+# CQL.  Cassandra must already be started before starting JanusGraph
 # with this file.
 
 #JANUSGRAPHCFG{gremlin.graph=org.janusgraph.core.JanusGraphFactory}
@@ -26,6 +26,8 @@
 
 #JANUSGRAPHCFG{storage.cql.keyspace=janusgraph}
 
+#JANUSGRAPHCFG{storage.cql.local-datacenter=datacenter1}
+
 #JANUSGRAPHCFG{cache.db-cache = true}
 
 #JANUSGRAPHCFG{cache.db-cache-clean-wait = 20}

janusgraph-dist/src/assembly/static/conf/gremlin-server/gremlin-server-cql-es.yaml

@@ -17,7 +17,7 @@ port: 8182
 evaluationTimeout: 30000
 channelizer: org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer
 graphs: {
-    graph: conf/gremlin-server/janusgraph-cql-es-server.properties
+    graph: conf/janusgraph-cql-es.properties
 }
 scriptEngines: {
     gremlin-groovy: {