test.py: basic cluster tests working

Author: kostja

test.py

@@ -37,6 +37,7 @@
 import subprocess
 import sys
 import time
+import uuid
 import xml.etree.ElementTree as ET
 import yaml
 
@@ -316,8 +317,6 @@ def pattern(self):
         return "*_test.cql"
 
 
-
-
 class PythonTestSuite(TestSuite):
     """A collection of Python pytests against a single Scylla instance"""
 
@@ -332,15 +331,17 @@ def __init__(self, path, cfg, options, mode):
 
         topology = self.cfg.get("topology", { "class": "simple", "replication_factor": 1 })
 
-        self.start_server = self.topology_for_class(topology["class"], topology) 
+        self.create_cluster = self.topology_for_class(topology["class"], topology) 
 
-        self.servers = Pool(cfg.get("pool_size", 2), self.start_server)
+        self.clusters = Pool(cfg.get("pool_size", 2), self.create_cluster)
 
-    def create_server(self):
+    def create_server(self, cluster_name, seed):
         server = ScyllaServer(
             exe=self.scylla_exe,
             vardir=self.options.tmpdir,
-            hosts=self.hosts,
+            host_registry=self.hosts,
+            cluster_name=cluster_name,
+            seed=seed,
             cmdline_options=self.cfg.get("extra_scylla_cmdline_options", []))
 
         # Suite artefacts are removed when
@@ -353,16 +354,18 @@ def create_server(self):
         return server
 
     def topology_for_class(self, class_name, cfg):
+
         if class_name.lower() == "simple":
             replicas = int(cfg["replication_factor"])
-            cluster = []
-
             async def start_simple():
+                cluster = []
+                cluster_name = str(uuid.uuid1())
                 for i in range(replicas):
-                    server = self.create_server()
+                    seed = cluster[0].host if cluster else None
+                    server = self.create_server(cluster_name, seed)
                     cluster.append(server)
                     await server.start()
-                return cluster[0]
+                return cluster
 
             return start_simple
         else:
@@ -610,8 +613,8 @@ def print_summary(self):
 
     async def run(self, options):
         # This test can and should be killed gently, with SIGTERM, not with SIGKILL
-        async with self.suite.servers.instance() as server:
-            self.args.insert(0, "--host={}".format(server.host))
+        async with self.suite.clusters.instance() as cluster:
+            self.args.insert(0, "--host={}".format(cluster[0].host))
             self.success = await run_test(self, options)
         logging.info("Test #%d %s", self.id, "succeeded" if self.success else "failed ")
         return self

test/pylib/scylla_server.py

@@ -69,20 +69,20 @@
 
 
 class ScyllaServer:
-    def __init__(self, exe=None, vardir=None, hosts=None,
-                 cmdline_options=None):
+    def __init__(self, exe=None, vardir=None, host_registry=None,
+                 cluster_name=None, seed=None, cmdline_options=None):
         self.exe = os.path.abspath(exe)
         self.vardir = vardir
-        self.hosts = hosts
+        self.host_registry = host_registry
         self.cmdline_options = cmdline_options
         self.cfg = {
-            "cluster_name": None,
+            "cluster_name": cluster_name,
             "host": None,
-            "workdir": None,
-            "seeds": None,
-            "skip_wait_for_gossip_to_settle": 0,
             "ring_delay_ms": 0,
+            "seeds": seed,
+            "skip_wait_for_gossip_to_settle": 0,
             "smp": 2,
+            "workdir": None,
         }
         self.cmd = None
 
@@ -124,10 +124,9 @@ async def install(self):
 
         # Scylla assumes all instances of a cluster use the same port,
         # so each instance needs an own IP address.
-        self.cfg["cluster_name"] = str(uuid.uuid1())
-        self.cfg["host"] = await self.hosts.lease_host()
+        self.cfg["host"] = await self.host_registry.lease_host()
+        self.cfg["seeds"] = self.cfg.get("seeds") or self.cfg["host"]
         self.cfg["workdir"] = os.path.join(self.vardir, self.cfg["host"])
-        self.cfg["seeds"] = self.cfg["host"]
 
         logging.info("installing Scylla server in %s...", self.cfg["workdir"])
 
@@ -239,5 +238,6 @@ async def uninstall(self):
 #        shutil.rmtree(self.cfg["workdir"])
 #        os.remove(self.log_file_name)
 
-        await self.hosts.release_host(self.cfg["host"])
+        await self.host_registry.release_host(self.cfg["host"])
         self.cfg["host"] = None
+

test/topology/conftest.py

@@ -116,7 +116,7 @@ def this_dc(cql):
 def test_keyspace(cql, this_dc):
     name = unique_name()
     cql.execute("CREATE KEYSPACE " + name + " WITH REPLICATION = { 'class' : 'NetworkTopologyStrategy', '" +
-                this_dc + "' : 1 }")
+                this_dc + "' : 3 }")
     yield name
     cql.execute("DROP KEYSPACE " + name)