Merge pull request #178 from sylwiaszunejko/unix_socket

Fix setting up connection to non-IP sockets

.github/workflows/main.yml

@@ -12,7 +12,7 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     env:
-      SCYLLA_IMAGE: scylladb/scylla:5.4.6
+      SCYLLA_IMAGE: scylladb/scylla:6.0.0
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2

control.go

@@ -270,7 +270,11 @@ type connHost struct {
 func (c *controlConn) setupConn(conn *Conn) error {
 	// we need up-to-date host info for the filterHost call below
 	iter := conn.querySystemLocal(context.TODO())
-	host, err := c.session.hostInfoFromIter(iter, conn.host.connectAddress, conn.conn.RemoteAddr().(*net.TCPAddr).Port)
+	defaultPort := 9042
+	if tcpAddr, ok := conn.conn.RemoteAddr().(*net.TCPAddr); ok {
+		defaultPort = tcpAddr.Port
+	}
+	host, err := c.session.hostInfoFromIter(iter, conn.host.connectAddress, defaultPort)
 	if err != nil {
 		return err
 	}

control_integration_test.go

@@ -0,0 +1,71 @@
+//go:build integration && scylla
+// +build integration,scylla
+
+package gocql
+
+import (
+	"context"
+	"fmt"
+	"net"
+	"testing"
+)
+
+// unixSocketDialer is a special dialer which connects only to the maintenance_socket.
+type unixSocketDialer struct {
+	dialer     net.Dialer
+	socketPath string
+}
+
+func (d unixSocketDialer) DialContext(_ context.Context, _, _ string) (net.Conn, error) {
+	return d.dialer.Dial("unix", d.socketPath)
+}
+
+func TestUnixSockets(t *testing.T) {
+	socketPath := "/tmp/scylla/cql.m"
+
+	c := createCluster()
+	c.NumConns = 1
+	c.DisableInitialHostLookup = true
+	c.ProtoVersion = 3
+	c.ReconnectInterval = 0
+	c.WriteCoalesceWaitTime = 0
+
+	c.Events.DisableNodeStatusEvents = true
+	c.Events.DisableTopologyEvents = true
+	c.Events.DisableSchemaEvents = true
+
+	d := net.Dialer{
+		Timeout: c.Timeout,
+	}
+	if c.SocketKeepalive > 0 {
+		d.KeepAlive = c.SocketKeepalive
+	}
+
+	c.Dialer = unixSocketDialer{
+		dialer:     d,
+		socketPath: socketPath,
+	}
+
+	sess, err := c.CreateSession()
+	if err != nil {
+		panic(fmt.Sprintf("unable to create session: %v", err))
+	}
+
+	defer sess.Close()
+
+	keyspace := "test1"
+
+	err = createTable(sess, `DROP KEYSPACE IF EXISTS `+keyspace)
+	if err != nil {
+		t.Fatal("unable to drop keyspace if exists:", err)
+	}
+
+	err = createTable(sess, fmt.Sprintf(`CREATE KEYSPACE %s
+	WITH replication = {
+		'class' : 'SimpleStrategy',
+		'replication_factor' : 1
+	}`, keyspace))
+	if err != nil {
+		t.Fatal("unable to create keyspace:", err)
+	}
+}

docker-compose.yml

@@ -15,6 +15,7 @@ services:
       public:
         ipv4_address: 192.168.100.11
     volumes:
+    - /tmp/scylla:/var/lib/scylla/
     - type: bind
       source: ./testdata/config/scylla.yaml
       target: /etc/scylla/scylla.yaml
@@ -33,10 +34,8 @@ services:
       timeout: 5s
       retries: 18
   node_2:
-    image: scylladb/scylla-nightly:6.0.0-rc2-0.20240602.cbf47319c1f7
+    image: ${SCYLLA_IMAGE}
     command: |
-      --experimental-features consistent-topology-changes
-      --experimental-features tablets
       --smp 2
       --memory 1G
       --seeds 192.168.100.12
@@ -49,10 +48,8 @@ services:
       timeout: 5s
       retries: 18
   node_3:
-    image: scylladb/scylla-nightly:6.0.0-rc2-0.20240602.cbf47319c1f7
+    image: ${SCYLLA_IMAGE}
     command: |
-      --experimental-features consistent-topology-changes
-      --experimental-features tablets
       --smp 2
       --memory 1G
       --seeds 192.168.100.12
@@ -68,10 +65,8 @@ services:
       node_2:
         condition: service_healthy
   node_4:
-    image: scylladb/scylla-nightly:6.0.0-rc2-0.20240602.cbf47319c1f7
+    image: ${SCYLLA_IMAGE}
     command: |
-      --experimental-features consistent-topology-changes
-      --experimental-features tablets
       --smp 2
       --memory 1G
       --seeds 192.168.100.12

integration.sh

@@ -27,6 +27,8 @@ function scylla_restart() {
 
 scylla_restart
 
+sudo chmod 0777 /tmp/scylla/cql.m
+
 readonly clusterSize=1
 readonly multiNodeClusterSize=3
 readonly scylla_liveset="192.168.100.11"

metadata_cassandra.go

@@ -994,7 +994,6 @@ func getMaterializedViewsMetadata(session *Session, keyspaceName string) ([]Mate
 			compaction,
 			compression,
 			crc_check_chance,
-			dclocal_read_repair_chance,
 			default_time_to_live,
 			extensions,
 			gc_grace_seconds,
@@ -1003,7 +1002,6 @@ func getMaterializedViewsMetadata(session *Session, keyspaceName string) ([]Mate
 			max_index_interval,
 			memtable_flush_period_in_ms,
 			min_index_interval,
-			read_repair_chance,
 			speculative_retry
 		FROM %s
 		WHERE keyspace_name = ?`, tableName)

metadata_scylla.go

@@ -553,13 +553,11 @@ func getTableMetadata(session *Session, keyspaceName string) ([]TableMetadata, e
 		"compaction":                  &table.Options.Compaction,
 		"compression":                 &table.Options.Compression,
 		"crc_check_chance":            &table.Options.CrcCheckChance,
-		"dclocal_read_repair_chance":  &table.Options.DcLocalReadRepairChance,
 		"default_time_to_live":        &table.Options.DefaultTimeToLive,
 		"gc_grace_seconds":            &table.Options.GcGraceSeconds,
 		"max_index_interval":          &table.Options.MaxIndexInterval,
 		"memtable_flush_period_in_ms": &table.Options.MemtableFlushPeriodInMs,
 		"min_index_interval":          &table.Options.MinIndexInterval,
-		"read_repair_chance":          &table.Options.ReadRepairChance,
 		"speculative_retry":           &table.Options.SpeculativeRetry,
 		"flags":                       &table.Flags,
 		"extensions":                  &table.Extensions,
@@ -772,13 +770,11 @@ func getViewMetadata(session *Session, keyspaceName string) ([]ViewMetadata, err
 		"compaction":                  &view.Options.Compaction,
 		"compression":                 &view.Options.Compression,
 		"crc_check_chance":            &view.Options.CrcCheckChance,
-		"dclocal_read_repair_chance":  &view.Options.DcLocalReadRepairChance,
 		"default_time_to_live":        &view.Options.DefaultTimeToLive,
 		"gc_grace_seconds":            &view.Options.GcGraceSeconds,
 		"max_index_interval":          &view.Options.MaxIndexInterval,
 		"memtable_flush_period_in_ms": &view.Options.MemtableFlushPeriodInMs,
 		"min_index_interval":          &view.Options.MinIndexInterval,
-		"read_repair_chance":          &view.Options.ReadRepairChance,
 		"speculative_retry":           &view.Options.SpeculativeRetry,
 		"extensions":                  &view.Extensions,
 	}) {

recreate.go

@@ -319,13 +319,11 @@ func (h toCQLHelpers) tableOptionsToCQL(ops TableMetadataOptions) ([]string, err
 		"bloom_filter_fp_chance":      ops.BloomFilterFpChance,
 		"comment":                     ops.Comment,
 		"crc_check_chance":            ops.CrcCheckChance,
-		"dclocal_read_repair_chance":  ops.DcLocalReadRepairChance,
 		"default_time_to_live":        ops.DefaultTimeToLive,
 		"gc_grace_seconds":            ops.GcGraceSeconds,
 		"max_index_interval":          ops.MaxIndexInterval,
 		"memtable_flush_period_in_ms": ops.MemtableFlushPeriodInMs,
 		"min_index_interval":          ops.MinIndexInterval,
-		"read_repair_chance":          ops.ReadRepairChance,
 		"speculative_retry":           ops.SpeculativeRetry,
 	}
 

testdata/config/scylla.yaml

@@ -8,5 +8,4 @@ client_encryption_options:
   keyfile: /etc/scylla/db.key
   truststore: /etc/scylla/ca.crt
   require_client_auth: true
-# when using 5.4.x we have to specify force_schema_commit_log option
-force_schema_commit_log: true
+maintenance_socket: workdir

testdata/recreate/index_golden.cql

@@ -16,13 +16,11 @@ CREATE TABLE gocqlx_idx.menus (
     AND compaction = {'class':'SizeTieredCompactionStrategy'}
     AND compression = {'sstable_compression':'org.apache.cassandra.io.compress.LZ4Compressor'}
     AND crc_check_chance = 1
-    AND dclocal_read_repair_chance = 0
     AND default_time_to_live = 0
     AND gc_grace_seconds = 864000
     AND max_index_interval = 2048
     AND memtable_flush_period_in_ms = 0
     AND min_index_interval = 128
-    AND read_repair_chance = 0
     AND speculative_retry = '99.0PERCENTILE';
 
 CREATE INDEX menus_name_idx ON gocqlx_idx.menus (name);

testdata/recreate/materialized_views_golden.cql

@@ -14,13 +14,11 @@ CREATE TABLE gocqlx_mv.mv_buildings (
     AND compaction = {'class':'SizeTieredCompactionStrategy'}
     AND compression = {'sstable_compression':'org.apache.cassandra.io.compress.LZ4Compressor'}
     AND crc_check_chance = 1
-    AND dclocal_read_repair_chance = 0
     AND default_time_to_live = 0
     AND gc_grace_seconds = 864000
     AND max_index_interval = 2048
     AND memtable_flush_period_in_ms = 0
     AND min_index_interval = 128
-    AND read_repair_chance = 0
     AND speculative_retry = '99.0PERCENTILE';
 
 CREATE MATERIALIZED VIEW gocqlx_mv.mv_building_by_city AS
@@ -35,13 +33,11 @@ CREATE MATERIALIZED VIEW gocqlx_mv.mv_building_by_city AS
     AND compaction = {'class':'SizeTieredCompactionStrategy'}
     AND compression = {'sstable_compression':'org.apache.cassandra.io.compress.LZ4Compressor'}
     AND crc_check_chance = 1
-    AND dclocal_read_repair_chance = 0
     AND default_time_to_live = 0
     AND gc_grace_seconds = 864000
     AND max_index_interval = 2048
     AND memtable_flush_period_in_ms = 0
     AND min_index_interval = 128
-    AND read_repair_chance = 0
     AND speculative_retry = '99.0PERCENTILE';
 
 CREATE MATERIALIZED VIEW gocqlx_mv.mv_building_by_city2 AS
@@ -59,11 +55,9 @@ CREATE MATERIALIZED VIEW gocqlx_mv.mv_building_by_city2 AS
     AND compaction = {'class':'SizeTieredCompactionStrategy'}
     AND compression = {'sstable_compression':'org.apache.cassandra.io.compress.LZ4Compressor'}
     AND crc_check_chance = 1
-    AND dclocal_read_repair_chance = 0
     AND default_time_to_live = 0
     AND gc_grace_seconds = 864000
     AND max_index_interval = 2048
     AND memtable_flush_period_in_ms = 0
     AND min_index_interval = 128
-    AND read_repair_chance = 0
     AND speculative_retry = '99.0PERCENTILE';

testdata/recreate/secondary_index_golden.cql

@@ -16,13 +16,11 @@ CREATE TABLE gocqlx_sec_idx.menus (
     AND compaction = {'class':'SizeTieredCompactionStrategy'}
     AND compression = {'sstable_compression':'org.apache.cassandra.io.compress.LZ4Compressor'}
     AND crc_check_chance = 1
-    AND dclocal_read_repair_chance = 0
     AND default_time_to_live = 0
     AND gc_grace_seconds = 864000
     AND max_index_interval = 2048
     AND memtable_flush_period_in_ms = 0
     AND min_index_interval = 128
-    AND read_repair_chance = 0
     AND speculative_retry = '99.0PERCENTILE';
 
 CREATE INDEX menus_name_idx ON gocqlx_sec_idx.menus ((location), name);

testdata/recreate/table.cql

@@ -8,8 +8,7 @@ CREATE TABLE gocqlx_table.monkeySpecies (
     common_name text,
     population varint,
     average_size int
-) WITH comment='Important biological records'
-   AND read_repair_chance = 1.0;
+) WITH comment='Important biological records';
 
 CREATE TABLE gocqlx_table.timeline (
     userid uuid,

testdata/recreate/table_golden.cql

@@ -16,13 +16,11 @@ CREATE TABLE gocqlx_table.loads (
     AND compaction = {'class':'TimeWindowCompactionStrategy','compaction_window_size':'14','compaction_window_unit':'DAYS'}
     AND compression = {'sstable_compression':'org.apache.cassandra.io.compress.LZ4Compressor'}
     AND crc_check_chance = 1
-    AND dclocal_read_repair_chance = 0
     AND default_time_to_live = 0
     AND gc_grace_seconds = 864000
     AND max_index_interval = 2048
     AND memtable_flush_period_in_ms = 0
     AND min_index_interval = 128
-    AND read_repair_chance = 0
     AND speculative_retry = '99.0PERCENTILE';
 
 CREATE TABLE gocqlx_table.monkeyspecies (
@@ -36,13 +34,11 @@ CREATE TABLE gocqlx_table.monkeyspecies (
     AND compaction = {'class':'SizeTieredCompactionStrategy'}
     AND compression = {'sstable_compression':'org.apache.cassandra.io.compress.LZ4Compressor'}
     AND crc_check_chance = 1
-    AND dclocal_read_repair_chance = 0
     AND default_time_to_live = 0
     AND gc_grace_seconds = 864000
     AND max_index_interval = 2048
     AND memtable_flush_period_in_ms = 0
     AND min_index_interval = 128
-    AND read_repair_chance = 1
     AND speculative_retry = '99.0PERCENTILE';
 
 CREATE TABLE gocqlx_table.timeline (
@@ -59,13 +55,11 @@ CREATE TABLE gocqlx_table.timeline (
     AND compaction = {'class':'LeveledCompactionStrategy'}
     AND compression = {'sstable_compression':'org.apache.cassandra.io.compress.LZ4Compressor'}
     AND crc_check_chance = 1
-    AND dclocal_read_repair_chance = 0
     AND default_time_to_live = 0
     AND gc_grace_seconds = 864000
     AND max_index_interval = 2048
     AND memtable_flush_period_in_ms = 0
     AND min_index_interval = 128
-    AND read_repair_chance = 0
     AND speculative_retry = '99.0PERCENTILE';
 
 CREATE TABLE gocqlx_table.users_picture (
@@ -81,11 +75,9 @@ CREATE TABLE gocqlx_table.users_picture (
     AND compaction = {'class':'SizeTieredCompactionStrategy'}
     AND compression = {'sstable_compression':'org.apache.cassandra.io.compress.LZ4Compressor'}
     AND crc_check_chance = 1
-    AND dclocal_read_repair_chance = 0
     AND default_time_to_live = 0
     AND gc_grace_seconds = 864000
     AND max_index_interval = 2048
     AND memtable_flush_period_in_ms = 0
     AND min_index_interval = 128
-    AND read_repair_chance = 0
     AND speculative_retry = '99.0PERCENTILE';