Fixed race condition in 'repo sync -jN' that would open multiple masters.
This fixes the SSH Control Masters to be managed in a thread-safe
fashion. This is important because "repo sync -jN" uses threads to
sync more than one repository at the same time. The problem didn't
show up earlier because it was masked if all of the threads tried to
connect to the same host that was used on the "repo init" line.
diff --git a/git_config.py b/git_config.py
index 8e3dfb1..26fc970 100644
--- a/git_config.py
+++ b/git_config.py
@@ -18,6 +18,10 @@
import re
import subprocess
import sys
+try:
+ import threading as _threading
+except ImportError:
+ import dummy_threading as _threading
import time
from signal import SIGTERM
from urllib2 import urlopen, HTTPError
@@ -361,76 +365,97 @@
_master_processes = []
_master_keys = set()
_ssh_master = True
+_master_keys_lock = None
+
+def init_ssh():
+ """Should be called once at the start of repo to init ssh master handling.
+
+ At the moment, all we do is to create our lock.
+ """
+ global _master_keys_lock
+ assert _master_keys_lock is None, "Should only call init_ssh once"
+ _master_keys_lock = _threading.Lock()
def _open_ssh(host, port=None):
global _ssh_master
- # Check to see whether we already think that the master is running; if we
- # think it's already running, return right away.
- if port is not None:
- key = '%s:%s' % (host, port)
- else:
- key = host
+ # Acquire the lock. This is needed to prevent opening multiple masters for
+ # the same host when we're running "repo sync -jN" (for N > 1) _and_ the
+ # manifest <remote fetch="ssh://xyz"> specifies a different host from the
+ # one that was passed to repo init.
+ _master_keys_lock.acquire()
+ try:
- if key in _master_keys:
- return True
+ # Check to see whether we already think that the master is running; if we
+ # think it's already running, return right away.
+ if port is not None:
+ key = '%s:%s' % (host, port)
+ else:
+ key = host
- if not _ssh_master \
- or 'GIT_SSH' in os.environ \
- or sys.platform in ('win32', 'cygwin'):
- # failed earlier, or cygwin ssh can't do this
- #
- return False
+ if key in _master_keys:
+ return True
- # We will make two calls to ssh; this is the common part of both calls.
- command_base = ['ssh',
- '-o','ControlPath %s' % ssh_sock(),
- host]
- if port is not None:
- command_base[1:1] = ['-p',str(port)]
+ if not _ssh_master \
+ or 'GIT_SSH' in os.environ \
+ or sys.platform in ('win32', 'cygwin'):
+ # failed earlier, or cygwin ssh can't do this
+ #
+ return False
- # Since the key wasn't in _master_keys, we think that master isn't running.
- # ...but before actually starting a master, we'll double-check. This can
- # be important because we can't tell that that 'git@myhost.com' is the same
- # as 'myhost.com' where "User git" is setup in the user's ~/.ssh/config file.
- check_command = command_base + ['-O','check']
- try:
- Trace(': %s', ' '.join(check_command))
- check_process = subprocess.Popen(check_command,
- stdout=subprocess.PIPE,
- stderr=subprocess.PIPE)
- check_process.communicate() # read output, but ignore it...
- isnt_running = check_process.wait()
+ # We will make two calls to ssh; this is the common part of both calls.
+ command_base = ['ssh',
+ '-o','ControlPath %s' % ssh_sock(),
+ host]
+ if port is not None:
+ command_base[1:1] = ['-p',str(port)]
- if not isnt_running:
- # Our double-check found that the master _was_ infact running. Add to
- # the list of keys.
- _master_keys.add(key)
- return True
- except Exception:
- # Ignore excpetions. We we will fall back to the normal command and print
- # to the log there.
- pass
+ # Since the key wasn't in _master_keys, we think that master isn't running.
+ # ...but before actually starting a master, we'll double-check. This can
+ # be important because we can't tell that that 'git@myhost.com' is the same
+ # as 'myhost.com' where "User git" is setup in the user's ~/.ssh/config file.
+ check_command = command_base + ['-O','check']
+ try:
+ Trace(': %s', ' '.join(check_command))
+ check_process = subprocess.Popen(check_command,
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE)
+ check_process.communicate() # read output, but ignore it...
+ isnt_running = check_process.wait()
- command = command_base[:1] + \
- ['-M', '-N'] + \
- command_base[1:]
- try:
- Trace(': %s', ' '.join(command))
- p = subprocess.Popen(command)
- except Exception, e:
- _ssh_master = False
- print >>sys.stderr, \
- '\nwarn: cannot enable ssh control master for %s:%s\n%s' \
- % (host,port, str(e))
- return False
+ if not isnt_running:
+ # Our double-check found that the master _was_ infact running. Add to
+ # the list of keys.
+ _master_keys.add(key)
+ return True
+ except Exception:
+ # Ignore excpetions. We we will fall back to the normal command and print
+ # to the log there.
+ pass
- _master_processes.append(p)
- _master_keys.add(key)
- time.sleep(1)
- return True
+ command = command_base[:1] + \
+ ['-M', '-N'] + \
+ command_base[1:]
+ try:
+ Trace(': %s', ' '.join(command))
+ p = subprocess.Popen(command)
+ except Exception, e:
+ _ssh_master = False
+ print >>sys.stderr, \
+ '\nwarn: cannot enable ssh control master for %s:%s\n%s' \
+ % (host,port, str(e))
+ return False
+
+ _master_processes.append(p)
+ _master_keys.add(key)
+ time.sleep(1)
+ return True
+ finally:
+ _master_keys_lock.release()
def close_ssh():
+ global _master_keys_lock
+
terminate_ssh_clients()
for p in _master_processes:
@@ -449,6 +474,9 @@
except OSError:
pass
+ # We're done with the lock, so we can delete it.
+ _master_keys_lock = None
+
URI_SCP = re.compile(r'^([^@:]*@?[^:/]{1,}):')
URI_ALL = re.compile(r'^([a-z][a-z+]*)://([^@/]*@?[^/]*)/')
diff --git a/main.py b/main.py
index 70ddeff..31a18e1 100755
--- a/main.py
+++ b/main.py
@@ -28,7 +28,7 @@
import sys
from trace import SetTrace
-from git_config import close_ssh
+from git_config import init_ssh, close_ssh
from command import InteractiveCommand
from command import MirrorSafeCommand
from command import PagedCommand
@@ -214,6 +214,7 @@
repo = _Repo(opt.repodir)
try:
try:
+ init_ssh()
repo._Run(argv)
finally:
close_ssh()