Merge pull request #118 from stardog-union/develop

release 0.12.0
stardog-union · Oct 7, 2022 · f51bfef · f51bfef
2 parents 7540c47 + c22f94e
commit f51bfef
Show file tree

Hide file tree

Showing 28 changed files with 294,430 additions and 91 deletions.
diff --git a/.env b/.env
@@ -4,7 +4,7 @@ STARDOG_USER=admin
 STARDOG_PASS=admin
 
 # Zookeeper version tag
-ZOO_TAG=3.4
+ZOO_TAG=3.5.9
 
 # HAProxy
 HAPROXY_TAG=latest

diff --git a/docker-compose.cluster.yml b/docker-compose.cluster.yml
@@ -6,11 +6,12 @@
 version: "3.3"
 services:
   zoo1:
-    image: zookeeper:${ZOO_TAG}
+    image: bitnami/zookeeper:${ZOO_TAG}
     container_name: zkn1
     environment:
         ZOO_MY_ID: 1
         ZOO_SERVERS: server.1=0.0.0.0:2888:3888
+        ALLOW_ANONYMOUS_LOGIN: "yes"
 
   sd1:
     build:
@@ -98,6 +99,7 @@ services:
       - STARDOG_HOSTNAME_NODE_1=${STARDOG_HOSTNAME_NODE_1}
       - STARDOG_HOSTNAME_CACHE=${STARDOG_HOSTNAME_CACHE}
       - STARDOG_HOSTNAME_STANDBY=${STARDOG_HOSTNAME_STANDBY}
+      - STARDOG_ENDPOINT=http://${STARDOG_LB}:5820
       - STARDOG_LB=${STARDOG_LB}
       - STARDOG_USER=${STARDOG_USER}
       - STARDOG_PASS=${STARDOG_PASS}

diff --git a/dockerfiles/dockerfile-stardog b/dockerfiles/dockerfile-stardog
@@ -6,7 +6,6 @@ RUN wget https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-${
   && unzip mysql-connector-java-${CONNECTOR_VERSION}.zip \
   && mv mysql-connector-java-${CONNECTOR_VERSION}/mysql-connector-java-${CONNECTOR_VERSION}.jar /tmp/mysql-connector-java.jar
 
-
 FROM stardog/stardog
 
 ARG NODE_TYPE

diff --git a/dockerfiles/stardog.node.properties b/dockerfiles/stardog.node.properties
@@ -5,6 +5,5 @@ pack.enabled=true
 #pack.node.address=196.69.68.4
 # the connection string for ZooKeeper where cluster state is stored
 pack.zookeeper.address=zoo1:2181
-
-# would need to change for production
-pack.zookeeper.auth=admin:admin
+# So it doesn't conflict with other tests.
+catalog.auto.create.db=false
diff --git a/dockerfiles/stardog.single.properties b/dockerfiles/stardog.single.properties
@@ -1,2 +1,2 @@
 # Empty as we currently don't need specific properties for single node testing
-# we still need an existing property file so that the Dockerfile doesn't break
+# we still need an existing property file so that the Dockerfile doesn't break
diff --git a/dockerfiles/stardog.standby.properties b/dockerfiles/stardog.standby.properties
@@ -6,10 +6,11 @@ pack.enabled=true
 # the connection string for ZooKeeper where cluster state is stored
 pack.zookeeper.address=zoo1:2181
 
-# would need to change for production
-pack.zookeeper.auth=admin:admin
-
 # Make the node a standby node
 # https://docs.stardog.com/cluster/operating-the-cluster/standby-nodes
 pack.standby=true
 pack.standby.node.sync.interval=5m
+
+# otherwise we try to join a cluster with databases into an empty cluster, which turns into an error.
+# an alternative is to start the server with --force-join.
+catalog.auto.create.db=false
diff --git a/dockerfiles/start-standby.sh b/dockerfiles/start-standby.sh
@@ -22,6 +22,7 @@ function wait_for_cluster_ready(){
     )
 
 }
+
 wait_for_cluster_ready
 echo "Main cluster ready, starting standby node"
 /var/start.sh
diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="pystardog",
-    version="0.11.1",
+    version="0.12.0",
     author="Stardog Union",
     author_email="[email protected]",
     description="Use Stardog with Python!",