Commit c89ed4a6 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 902c76b3
...@@ -274,7 +274,10 @@ class NEOCluster(object): ...@@ -274,7 +274,10 @@ class NEOCluster(object):
self.process_dict = {} self.process_dict = {}
self.temp_dir = temp_dir self.temp_dir = temp_dir
self.port_allocator = PortAllocator() self.port_allocator = PortAllocator()
admin_port = self.port_allocator.allocate(address_type, local_ip) try:
admin_port = int(os.getenv('NEO_ADMIN_PORT'))
except (TypeError, ValueError):
admin_port = self.port_allocator.allocate(address_type, local_ip)
self.cluster_name = name or 'neo_%s' % random.randint(0, 100) self.cluster_name = name or 'neo_%s' % random.randint(0, 100)
master_node_list = [self.port_allocator.allocate(address_type, local_ip) master_node_list = [self.port_allocator.allocate(address_type, local_ip)
for i in xrange(master_count)] for i in xrange(master_count)]
......
#!/bin/sh -xe
NEO_ADMIN_PORT=5551 \
neosimple --adapter=SQLite --temp_dir=tmp/1 --logger --name neo1 s1
#!/bin/sh -xe
NEO_ADMIN_PORT=5552 \
neosimple --adapter=SQLite --temp_dir=tmp/2 --logger --name neo2 s1
...@@ -5,6 +5,11 @@ Application (master) ...@@ -5,6 +5,11 @@ Application (master)
.tm TransactionManager .tm TransactionManager
.pt PartitionTable .pt PartitionTable
.listening_conn ListeningConnection
.primary ?
.primary_master_node ?
.cluster_state
.backup_app BackupApplication .backup_app BackupApplication
.admin_handler AdministrationHandler .admin_handler AdministrationHandler
...@@ -12,8 +17,6 @@ Application (master) ...@@ -12,8 +17,6 @@ Application (master)
.client_service_handler ClientServiceHandler .client_service_handler ClientServiceHandler
.storage_service_handler StorageServiceHandler .storage_service_handler StorageServiceHandler
.listening_conn ListeningConnection
Handlers Handlers
-------- --------
...@@ -73,6 +76,9 @@ EventHandler ...@@ -73,6 +76,9 @@ EventHandler
-> getattr(self, pkt.handler_method_name) (conn, *pkt.decode(), **kw) -> getattr(self, pkt.handler_method_name) (conn, *pkt.decode(), **kw)
IdentificationHandler < MasterHandler
Connections Connections
----------- -----------
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment