Skip to content

Try again to start plasma manager if there is a port collision #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robertnishihara merged 1 commit into from
Oct 31, 2016
Merged

Try again to start plasma manager if there is a port collision #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/common/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@

#define CHECK(COND) CHECKM(COND, "")

/* These are exit codes for common errors that can occur in Ray components. */
#define EXIT_COULD_NOT_BIND_PORT -2

/** This macro indicates that this pointer owns the data it is pointing to
* and is responsible for freeing it. */
#define OWNER
Expand Down
6 changes: 4 additions & 2 deletions src/plasma/plasma_manager.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -908,7 +908,9 @@ void start_server(const char *store_socket_name,
CHECK(g_manager_state);

int remote_sock = bind_inet_sock(port);
CHECKM(remote_sock >= 0, "Unable to bind to manager port");
if (remote_sock < 0) {
exit(EXIT_COULD_NOT_BIND_PORT);
}
int local_sock = bind_ipc_sock(manager_socket_name);
CHECKM(local_sock >= 0, "Unable to bind local manager socket");

Expand Down Expand Up @@ -984,7 +986,7 @@ int main(int argc, char *argv[]) {
if (!master_addr) {
LOG_ERR(
"please specify ip address of the current host in the format "
"123.456.789.10 with -m switch");
"123.456.789.10 with -h switch");
exit(-1);
}
if (port == -1) {
Expand Down
52 changes: 28 additions & 24 deletions src/plasma/test/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,32 @@ def assert_get_object_equal(unit_test, client1, client2, object_id, memory_buffe
unit_test.assertEqual(client1.get_metadata(object_id)[:],
client2.get_metadata(object_id)[:])

def start_plasma_manager(store_name, host_name, redis_port, use_valgrind=False):
"""Start a plasma manager and return the ports it listens on."""
plasma_manager_executable = os.path.join(os.path.abspath(os.path.dirname(__file__)), "../build/plasma_manager")
num_retries = 5
port = None
process = None
while num_retries >= 0:
port = random.randint(10000, 50000)
command = [plasma_manager_executable,
"-s", store_name,
"-m", host_name,
"-h", "127.0.0.1",
"-p", str(port),
"-r", "{addr}:{port}".format(addr="127.0.0.1", port=redis_port)]
print("Try to start plasma manager on port " + str(port))
if use_valgrind:
process = subprocess.Popen(["valgrind", "--track-origins=yes", "--leak-check=full", "--show-leak-kinds=all", "--error-exitcode=1"] + command)
else:
process = subprocess.Popen(command)
time.sleep(0.1)
# See if the process has terminated
if process.poll() == None:
return process, port
num_retries = num_retries - 1
raise Exception("Couldn't start plasma manager")

# Check if the redis-server binary is present.
redis_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), "../../common/thirdparty/redis-3.2.3/src/redis-server")
if not os.path.exists(redis_path):
Expand Down Expand Up @@ -240,30 +266,8 @@ def setUp(self):
time.sleep(0.1)

# Start two PlasmaManagers.
self.port1 = random.randint(10000, 50000)
self.port2 = random.randint(10000, 50000)
plasma_manager_executable = os.path.join(os.path.abspath(os.path.dirname(__file__)), "../build/plasma_manager")
plasma_manager_command1 = [plasma_manager_executable,
"-s", store_name1,
"-m", manager_name1,
"-h", "127.0.0.1",
"-p", str(self.port1),
"-r", "{addr}:{port}".format(addr="127.0.0.1",
port=redis_port)]
plasma_manager_command2 = [plasma_manager_executable,
"-s", store_name2,
"-m", manager_name2,
"-h", "127.0.0.1",
"-p", str(self.port2),
"-r", "{addr}:{port}".format(addr="127.0.0.1",
port=redis_port)]

if USE_VALGRIND:
self.p4 = subprocess.Popen(["valgrind", "--track-origins=yes", "--leak-check=full", "--show-leak-kinds=all", "--error-exitcode=1"] + plasma_manager_command1)
self.p5 = subprocess.Popen(["valgrind", "--track-origins=yes", "--leak-check=full", "--show-leak-kinds=all", "--error-exitcode=1"] + plasma_manager_command2)
else:
self.p4 = subprocess.Popen(plasma_manager_command1)
self.p5 = subprocess.Popen(plasma_manager_command2)
self.p4, self.port1 = start_plasma_manager(store_name1, manager_name1, redis_port, USE_VALGRIND)
self.p5, self.port2 = start_plasma_manager(store_name2, manager_name2, redis_port, USE_VALGRIND)

# Connect two PlasmaClients.
self.client1 = plasma.PlasmaClient(store_name1, manager_name1)
Expand Down