This is an automated email from the ASF dual-hosted git repository.

potiuk pushed a commit to branch v2-3-test
in repository https://gitbox.apache.org/repos/asf/airflow.git


The following commit(s) were added to refs/heads/v2-3-test by this push:
     new b29d320394 Add IPV6 form of the address in cassandra status check 
(#23537)
b29d320394 is described below

commit b29d32039432c543e558b18741bcd5f6e98ae072
Author: Jarek Potiuk <[email protected]>
AuthorDate: Sat May 7 15:36:55 2022 +0200

    Add IPV6 form of the address in cassandra status check (#23537)
    
    This PR fixes problem introduced in 3.0.26 of cassandra image which
    adds square brackets around IP address regardless of its type.
    
    The problem was workarounded by pinning cassandra to 3.0.25 in
    the ##23522 as a quick fix, but this one introducec permanent,
    future-proof solution.
    
    Based on discussion in https://issues.apache.org/jira/browse/CASSANDRA-17612
    
    Fixes: #23523
    (cherry picked from commit 22a564296be1aee62d738105859bd94003ad9afc)
---
 scripts/ci/docker-compose/integration-cassandra.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/ci/docker-compose/integration-cassandra.yml 
b/scripts/ci/docker-compose/integration-cassandra.yml
index 301eb8f021..b0ad799dbd 100644
--- a/scripts/ci/docker-compose/integration-cassandra.yml
+++ b/scripts/ci/docker-compose/integration-cassandra.yml
@@ -18,8 +18,7 @@
 version: "3.7"
 services:
   cassandra:
-    # TODO: fix cassandra to 3.0.25 as latest 3.0 (3.0.26) does not start 
cleanly
-    image: cassandra:3.0.25
+    image: cassandra:3.0
     environment:
       HEAP_NEWSIZE: 128M
       MAX_HEAP_SIZE: 256M
@@ -27,7 +26,9 @@ services:
       - /dev/urandom:/dev/random   # Required to get non-blocking entropy 
source
       - cassandra-db-volume:/var/lib/cassandra
     healthcheck:
-      test: "[ $$(nodetool statusgossip) = running ]"
+      # We use IPv6 variant of the check to workaround the problem with 3.0.26 
version
+      # of Cassandra https://issues.apache.org/jira/browse/CASSANDRA-17581
+      test: "[ $$(nodetool --host '::FFFF:127.0.0.1' statusgossip) = running ]"
       interval: 5s
       timeout: 30s
       retries: 50

Reply via email to