Adding upstream version 5:7.2.4.upstream/5%7.2.4

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 110 insertions, 0 deletions

diff --git a/tests/unit/cluster/cluster-response-tls.tcl b/tests/unit/cluster/cluster-response-tls.tcl
new file mode 100644
index 0000000..a099fa7
--- /dev/null
+++ b/tests/unit/cluster/cluster-response-tls.tcl
@@ -0,0 +1,110 @@
+source tests/support/cluster.tcl
+
+proc get_port_from_moved_error {e} {
+    set ip_port [lindex [split $e " "] 2]
+    return [lindex [split $ip_port ":"] 1]
+}
+
+proc get_pport_by_port {port} {
+    foreach srv $::servers {
+        set srv_port [dict get $srv port]
+        if {$port == $srv_port} {
+            return [dict get $srv pport]
+        }
+    }
+    return 0
+}
+
+proc get_port_from_node_info {line} {
+    set fields [split $line " "]
+    set addr [lindex $fields 1]
+    set ip_port [lindex [split $addr "@"] 0]
+    return [lindex [split $ip_port ":"] 1]
+}
+
+proc cluster_response_tls {tls_cluster} {
+
+    test "CLUSTER SLOTS with different connection type -- tls-cluster $tls_cluster" {
+        set slots1 [R 0 cluster slots]
+        set pport [srv 0 pport]
+        set cluster_client [redis_cluster 127.0.0.1:$pport 0]
+        set slots2 [$cluster_client cluster slots]
+        $cluster_client close
+        # Compare the ports in the first row
+        assert_no_match [lindex $slots1 0 2 1] [lindex $slots2 0 2 1]
+    }
+
+    test "CLUSTER NODES return port according to connection type -- tls-cluster $tls_cluster" {
+        set nodes [R 0 cluster nodes]
+        set port1 [get_port_from_node_info [lindex [split $nodes "\r\n"] 0]]
+        set pport [srv 0 pport]
+        set cluster_client [redis_cluster 127.0.0.1:$pport 0]
+        set nodes [$cluster_client cluster nodes]
+        set port2 [get_port_from_node_info [lindex [split $nodes "\r\n"] 0]]
+        $cluster_client close
+        assert_not_equal $port1 $port2
+    }
+
+    set cluster [redis_cluster 127.0.0.1:[srv 0 port]]
+    set cluster_pport [redis_cluster 127.0.0.1:[srv 0 pport] 0]
+    $cluster refresh_nodes_map
+
+    test "Set many keys in the cluster -- tls-cluster $tls_cluster" {
+        for {set i 0} {$i < 5000} {incr i} {
+            $cluster set $i $i
+            assert { [$cluster get $i] eq $i }
+        }
+    }
+
+    test "Test cluster responses during migration of slot x -- tls-cluster $tls_cluster" {
+        set slot 10
+        array set nodefrom [$cluster masternode_for_slot $slot]
+        array set nodeto [$cluster masternode_notfor_slot $slot]
+        $nodeto(link) cluster setslot $slot importing $nodefrom(id)
+        $nodefrom(link) cluster setslot $slot migrating $nodeto(id)
+
+        # Get a key from that slot
+        set key [$nodefrom(link) cluster GETKEYSINSLOT $slot "1"]
+        # MOVED REPLY
+        catch {$nodeto(link) set $key "newVal"} e_moved1
+        assert_match "*MOVED*" $e_moved1
+        # ASK REPLY
+        catch {$nodefrom(link) set "abc{$key}" "newVal"} e_ask1
+        assert_match "*ASK*" $e_ask1
+
+        # UNSTABLE REPLY
+        assert_error "*TRYAGAIN*" {$nodefrom(link) mset "a{$key}" "newVal" $key "newVal2"}
+
+        # Connecting using another protocol
+        array set nodefrom_pport [$cluster_pport masternode_for_slot $slot]
+        array set nodeto_pport [$cluster_pport masternode_notfor_slot $slot]
+
+        # MOVED REPLY
+        catch {$nodeto_pport(link) set $key "newVal"} e_moved2
+        assert_match "*MOVED*" $e_moved2
+        # ASK REPLY
+        catch {$nodefrom_pport(link) set "abc{$key}" "newVal"} e_ask2
+        assert_match "*ASK*" $e_ask2
+        # Compare MOVED error's port
+        set port1 [get_port_from_moved_error $e_moved1]
+        set port2 [get_port_from_moved_error $e_moved2]
+        assert_not_equal $port1 $port2
+        assert_equal $port1 $nodefrom(port)
+        assert_equal $port2 [get_pport_by_port $nodefrom(port)]
+        # Compare ASK error's port
+        set port1 [get_port_from_moved_error $e_ask1]
+        set port2 [get_port_from_moved_error $e_ask2]
+        assert_not_equal $port1 $port2
+        assert_equal $port1 $nodeto(port)
+        assert_equal $port2 [get_pport_by_port $nodeto(port)]
+    }
+}
+
+if {$::tls} {
+    start_cluster 3 3 {tags {external:skip cluster tls} overrides {tls-cluster yes tls-replication yes}} {      
+        cluster_response_tls yes
+    }
+    start_cluster 3 3 {tags {external:skip cluster tls} overrides {tls-cluster no tls-replication no}} {
+        cluster_response_tls no
+    }
+}