All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 0d44725e authored by David Johnson's avatar David Johnson

Ensure docker vnode tmcc proxies are running in the boothook.

parent c74bf344
......@@ -469,6 +469,7 @@ sub CreateRoutingScripts($$);
sub RunRoutingScripts($$);
sub RunWithSignalsBlocked($@);
sub RunProxies($$);
sub AreProxiesRunning($$);
sub KillProxies($$);
sub InsertPostBootIptablesRules($$$$);
sub RemovePostBootIptablesRules($$$$);
......@@ -3874,6 +3875,10 @@ sub vnodeBootHook($$$$)
libutil::setState("TBSETUP");
}
if (AreProxiesRunning($vnode_id,$vmid) != 1) {
RunProxies($vnode_id,$vmid);
}
#
# Start up our Docker-to-pty script for this container; the capture
# will attach to it. We always fire this off here; it cannot
......@@ -6818,6 +6823,24 @@ sub RunProxies($$)
return 0;
}
# Returns 1 if proxies are running; 0 if not; -1 on error.
sub AreProxiesRunning($$)
{
my ($vnode_id,$vmid) = @_;
if (-e "/var/run/tmccproxy-$vnode_id.pid") {
open(FD,"/var/run/tmccproxy-$vnode_id.pid")
or return -1;
my $pid = <FD>;
close(FD);
chomp($pid);
if (kill(0,$pid) > 0) {
return 1;
}
}
return 0;
}
sub KillProxies($$)
{
my ($vnode_id,$vmid) = @_;
......
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