use fixed ports (5432+i)

Author: funbringer

run_shardlord.py

@@ -4,23 +4,22 @@
 from time import sleep
 
 from testgres import PostgresNode
-from testgres import get_new_node, default_username
 
 
 DBNAME = "postgres"
 
 
 class Shardlord(PostgresNode):
-    def __init__(self, name):
-        super(Shardlord, self).__init__(name=name, port=5432, use_logging=True)
+    def __init__(self, name, port=None):
+        super(Shardlord, self).__init__(name=name,
+                                        port=port,
+                                        use_logging=True)
 
         self.nodes = []
 
     @staticmethod
     def _common_conn_string(port):
-        return (
-            "dbname={} port={} "
-        ).format(DBNAME, port)
+        return "dbname={} port={}".format(DBNAME, port)
 
     @staticmethod
     def _common_conf_lines():
@@ -62,8 +61,7 @@ def init(self):
         return self
 
     def install(self):
-        self.safe_psql(dbname=DBNAME,
-                       query="create extension pg_shardman cascade")
+        self.safe_psql(DBNAME, "create extension pg_shardman cascade")
 
         return self
 
@@ -75,7 +73,7 @@ def cleanup(self):
 
         return self
 
-    def add_node(self, name):
+    def add_node(self, name, port=None):
         config_lines = (
             "max_logical_replication_workers = 50\n"
             "max_worker_processes = 60\n"
@@ -86,15 +84,14 @@ def add_node(self, name):
         config_lines += self._common_conf_lines()
 
         # create a new node
-        node = get_new_node(name, use_logging=True)
+        node = PostgresNode(name=name, port=port, use_logging=True)
         self.nodes.append(node)
 
         # start this node
         node.init() \
             .append_conf("postgresql.conf", config_lines) \
             .start() \
-            .safe_psql(dbname=DBNAME,
-                       query="create extension pg_shardman cascade")
+            .safe_psql(DBNAME, "create extension pg_shardman cascade")
 
         # finally, register this node
         conn_string = self._common_conn_string(node.port)
@@ -105,20 +102,35 @@ def add_node(self, name):
 
 
 if __name__ == "__main__":
+    # prepare ports for nodes
+    ports = [5432+i for i in range(4)]
+    ports.reverse()
+
+    # collect all logs into a single file
     logfile = "/tmp/shmn.log"
-    open(logfile, 'w').close() # truncate
+    open(logfile, 'w').close()  # truncate log file
     logging.basicConfig(filename=logfile, level=logging.DEBUG)
-    with Shardlord("DarthVader") as lord:
+
+    with Shardlord(name="DarthVader", port=ports.pop()) as lord:
         lord.init().start().install()
 
-        luke = lord.add_node("Luke")
-        lord.add_node("ObiVan")
-        lord.add_node("C3PO")
+        luke = lord.add_node(name="Luke", port=ports.pop())
+        lord.add_node(name="ObiVan", port=ports.pop())
+        lord.add_node(name="C3PO", port=ports.pop())
+
+        luke.safe_psql(DBNAME, "drop table if exists pt cascade")
+
+        luke.safe_psql(DBNAME, """
+            create table pt(id int4 not null, payload float4);
+        """)
+
+        luke.safe_psql(DBNAME, """
+            insert into pt select generate_series(1, 10), random();
+        """)
 
-        luke.safe_psql(DBNAME, "drop table if exists pt cascade;")
-        luke.safe_psql(DBNAME, "CREATE TABLE pt(id INT NOT NULL, payload REAL);")
-        luke.safe_psql(DBNAME, "INSERT INTO pt SELECT generate_series(1, 10), random();")
-        lord.safe_psql(DBNAME, "select shardman.create_hash_partitions(2, 'pt', 'id', 4, true);");
+        lord.safe_psql(DBNAME, """
+            select shardman.create_hash_partitions(2, 'pt', 'id', 4, true);
+        """)
 
         print("%s:" % lord.name)
         print("\t-> port %i" % lord.port)