From e12591fae214ca508f243f587f2f6b7126f9d23a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steffen=20K=C3=B6hler?= <steffen.koehler@uni-leipzig.de>
Date: Thu, 8 Oct 2020 11:52:48 +0200
Subject: [PATCH] Ship with correct version of hazelcast.xml. Prepare
introducing okapi-config.json
---
assets/hazelcast.xml | 164 +++++++++++++++++++++++++++++++++------
assets/okapi-config.json | 8 ++
2 files changed, 148 insertions(+), 24 deletions(-)
create mode 100644 assets/okapi-config.json
diff --git a/assets/hazelcast.xml b/assets/hazelcast.xml
index 599ddf2..dcaf953 100644
--- a/assets/hazelcast.xml
+++ b/assets/hazelcast.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (c) 2008-2017, Hazelcast, Inc. All Rights Reserved.
+ ~ Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -16,21 +16,28 @@
-->
<!--
- The default Hazelcast configuration. This is used when no hazelcast.xml is present.
- Please see the schema for how to configure Hazelcast at https://hazelcast.com/schema/config/hazelcast-config-3.8.xsd
- or the documentation at https://hazelcast.org/documentation/
+ The default Hazelcast configuration.
+
+ This XML file is used when no hazelcast.xml is present.
+
+ To learn how to configure Hazelcast, please see the schema at
+ https://hazelcast.com/schema/config/hazelcast-config-3.11.xsd
+ or the Reference Manual at https://hazelcast.org/documentation/
-->
-<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.8.xsd"
- xmlns="http://www.hazelcast.com/schema/config"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+<!--suppress XmlDefaultAttributeValue -->
+<hazelcast xmlns="http://www.hazelcast.com/schema/config"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.hazelcast.com/schema/config
+ http://www.hazelcast.com/schema/config/hazelcast-config-3.12.xsd">
+
<group>
<name>dev</name>
<password>dev-pass</password>
</group>
- <management-center enabled="false">http://localhost:8080/mancenter</management-center>
+ <management-center enabled="false">http://localhost:8080/hazelcast-mancenter</management-center>
<network>
- <public-address>${hazelcast.ip}:${hazelcast.port}</public-address>
- <port auto-increment="true" port-count="100">${hazelcast.port}</port>
+ <port auto-increment="true" port-count="100">5701</port>
<outbound-ports>
<!--
Allowed port range when connecting to other nodes.
@@ -42,8 +49,6 @@
<multicast enabled="true">
<multicast-group>224.2.2.3</multicast-group>
<multicast-port>54327</multicast-port>
- <multicast-time-to-live>32</multicast-time-to-live>
- <multicast-timeout-seconds>35</multicast-timeout-seconds>
</multicast>
<tcp-ip enabled="false">
<interface>127.0.0.1</interface>
@@ -63,6 +68,27 @@
<tag-key>type</tag-key>
<tag-value>hz-nodes</tag-value>
</aws>
+ <gcp enabled="false">
+ <zones>us-east1-b,us-east1-c</zones>
+ </gcp>
+ <azure enabled="false">
+ <client-id>CLIENT_ID</client-id>
+ <client-secret>CLIENT_SECRET</client-secret>
+ <tenant-id>TENANT_ID</tenant-id>
+ <subscription-id>SUB_ID</subscription-id>
+ <cluster-id>HZLCAST001</cluster-id>
+ <group-name>GROUP-NAME</group-name>
+ </azure>
+ <kubernetes enabled="false">
+ <namespace>MY-KUBERNETES-NAMESPACE</namespace>
+ <service-name>MY-SERVICE-NAME</service-name>
+ <service-label-name>MY-SERVICE-LABEL-NAME</service-label-name>
+ <service-label-value>MY-SERVICE-LABEL-VALUE</service-label-value>
+ </kubernetes>
+ <eureka enabled="false">
+ <self-registration>true</self-registration>
+ <namespace>hazelcast</namespace>
+ </eureka>
<discovery-strategies>
</discovery-strategies>
</join>
@@ -88,6 +114,9 @@
<!-- iteration count to use when generating the secret key -->
<iteration-count>19</iteration-count>
</symmetric-encryption>
+ <failure-detector>
+ <icmp enabled="false"/>
+ </failure-detector>
</network>
<partition-group enabled="false"/>
<executor-service name="default">
@@ -95,6 +124,9 @@
<!--Queue capacity. 0 means Integer.MAX_VALUE.-->
<queue-capacity>0</queue-capacity>
</executor-service>
+ <security>
+ <client-block-unmapped-actions>true</client-block-unmapped-actions>
+ </security>
<queue name="default">
<!--
Maximum size of the queue. When a JVM's local queue size reaches the maximum,
@@ -117,6 +149,8 @@
<async-backup-count>0</async-backup-count>
<empty-queue-ttl>-1</empty-queue-ttl>
+
+ <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
</queue>
<map name="default">
<!--
@@ -139,18 +173,18 @@
-->
<async-backup-count>0</async-backup-count>
<!--
- Maximum number of seconds for each entry to stay in the map. Entries that are
- older than <time-to-live-seconds> and not updated for <time-to-live-seconds>
- will get automatically evicted from the map.
- Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. Default is 0.
- -->
+ Maximum number of seconds for each entry to stay in the map. Entries that are
+ older than <time-to-live-seconds> and not updated for <time-to-live-seconds>
+ will get automatically evicted from the map.
+ Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. Default is 0
+ -->
<time-to-live-seconds>0</time-to-live-seconds>
<!--
- Maximum number of seconds for each entry to stay idle in the map. Entries that are
- idle(not touched) for more than <max-idle-seconds> will get
- automatically evicted from the map. Entry is touched if get, put or containsKey is called.
- Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. Default is 0.
- -->
+ Maximum number of seconds for each entry to stay idle in the map. Entries that are
+ idle(not touched) for more than <max-idle-seconds> will get
+ automatically evicted from the map. Entry is touched if get, put or containsKey is called.
+ Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. Default is 0.
+ -->
<max-idle-seconds>0</max-idle-seconds>
<!--
Valid values are:
@@ -169,12 +203,14 @@
<max-size policy="PER_NODE">0</max-size>
<!--
`eviction-percentage` property is deprecated and will be ignored when it is set.
+
As of version 3.7, eviction mechanism changed.
It uses a probabilistic algorithm based on sampling. Please see documentation for further details
-->
<eviction-percentage>25</eviction-percentage>
<!--
`min-eviction-check-millis` property is deprecated and will be ignored when it is set.
+
As of version 3.7, eviction mechanism changed.
It uses a probabilistic algorithm based on sampling. Please see documentation for further details
-->
@@ -187,13 +223,14 @@
Values of these entries might be different for that same key.
Which value should be set for the key? Conflict is resolved by
the policy set here. Default policy is PutIfAbsentMapMergePolicy
+
There are built-in merge policies such as
com.hazelcast.map.merge.PassThroughMergePolicy; entry will be overwritten if merging entry exists for the key.
com.hazelcast.map.merge.PutIfAbsentMapMergePolicy ; entry will be added if the merging entry doesn't exist in the cluster.
com.hazelcast.map.merge.HigherHitsMapMergePolicy ; entry with the higher hits wins.
com.hazelcast.map.merge.LatestUpdateMapMergePolicy ; entry with the latest update wins.
-->
- <merge-policy>com.hazelcast.map.merge.PutIfAbsentMapMergePolicy</merge-policy>
+ <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
<!--
Control caching of de-serialized values. Caching makes query evaluation faster, but it cost memory.
@@ -206,17 +243,55 @@
</map>
+ <!--
+ Configuration for an event journal. The event journal keeps events related
+ to a specific partition and data structure. For instance, it could keep
+ map add, update, remove, merge events along with the key, old value, new value and so on.
+ -->
+ <event-journal enabled="false">
+ <mapName>mapName</mapName>
+ <capacity>10000</capacity>
+ <time-to-live-seconds>0</time-to-live-seconds>
+ </event-journal>
+
+ <event-journal enabled="false">
+ <cacheName>cacheName</cacheName>
+ <capacity>10000</capacity>
+ <time-to-live-seconds>0</time-to-live-seconds>
+ </event-journal>
+
+ <!--
+ Configuration for a merkle tree.
+ The merkle tree is a data structure used for efficient comparison of the
+ difference in the contents of large data structures. The precision of
+ such a comparison mechanism is defined by the depth of the merkle tree.
+ -->
+ <merkle-tree enabled="false">
+ <mapName>mapName</mapName>
+ <depth>10</depth>
+ </merkle-tree>
+
<multimap name="default">
<backup-count>1</backup-count>
<value-collection-type>SET</value-collection-type>
+ <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
</multimap>
+ <replicatedmap name="default">
+ <in-memory-format>OBJECT</in-memory-format>
+ <async-fillup>true</async-fillup>
+ <statistics-enabled>true</statistics-enabled>
+ <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
+ </replicatedmap>
+
<list name="default">
<backup-count>1</backup-count>
+ <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
</list>
<set name="default">
<backup-count>1</backup-count>
+ <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
</set>
<jobtracker name="default">
@@ -247,8 +322,27 @@
<async-backup-count>0</async-backup-count>
<time-to-live-seconds>0</time-to-live-seconds>
<in-memory-format>BINARY</in-memory-format>
+ <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
</ringbuffer>
+ <flake-id-generator name="default">
+ <prefetch-count>100</prefetch-count>
+ <prefetch-validity-millis>600000</prefetch-validity-millis>
+ <id-offset>0</id-offset>
+ <node-id-offset>0</node-id-offset>
+ <statistics-enabled>true</statistics-enabled>
+ </flake-id-generator>
+
+ <atomic-long name="default">
+ <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
+ </atomic-long>
+
+ <atomic-reference name="default">
+ <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
+ </atomic-reference>
+
+ <count-down-latch name="default"/>
+
<serialization>
<portable-version>0</portable-version>
</serialization>
@@ -257,4 +351,26 @@
<lite-member enabled="false"/>
-</hazelcast>
\ No newline at end of file
+ <cardinality-estimator name="default">
+ <backup-count>1</backup-count>
+ <async-backup-count>0</async-backup-count>
+ <merge-policy batch-size="100">HyperLogLogMergePolicy</merge-policy>
+ </cardinality-estimator>
+
+ <scheduled-executor-service name="default">
+ <capacity>100</capacity>
+ <durability>1</durability>
+ <pool-size>16</pool-size>
+ <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
+ </scheduled-executor-service>
+
+ <crdt-replication>
+ <replication-period-millis>1000</replication-period-millis>
+ <max-concurrent-replication-targets>1</max-concurrent-replication-targets>
+ </crdt-replication>
+
+ <pn-counter name="default">
+ <replica-count>2147483647</replica-count>
+ <statistics-enabled>true</statistics-enabled>
+ </pn-counter>
+</hazelcast>
diff --git a/assets/okapi-config.json b/assets/okapi-config.json
new file mode 100644
index 0000000..69144a3
--- /dev/null
+++ b/assets/okapi-config.json
@@ -0,0 +1,8 @@
+{
+ "storage" : "postgres",
+ "postgres_host" : "okapi-db",
+ "postgres_port" : "5432",
+ "postgres_database" : "okapi",
+ "postgres_username" : "okapi",
+ "postgres_password" : "changeMe"
+ }
\ No newline at end of file
--
GitLab