Run xrootd on a different port so it doesn't conflict w/ stashcache

Author: matyasselmeci

osgtest/tests/test_150_xrootd.py

@@ -5,6 +5,9 @@
 import osgtest.library.service as service
 import osgtest.library.osgunittest as osgunittest
 
+
+XROOTD_PORT = 1096  # chosen so it doesn't conflict w/ the stashcache instances
+
 XROOTD_CFG_TEXT = """\
 cms.space min 2g 5g
 xrootd.seclib /usr/lib64/libXrdSec-4.so
@@ -17,6 +20,7 @@
     %s
 acc.authdb /etc/xrootd/auth_file
 ofs.authorize
+xrd.port %d
 """
 
 AUTHFILE_TEXT = """\
@@ -32,6 +36,7 @@ def test_01_start_xrootd(self):
         core.config['certs.xrootdcert'] = '/etc/grid-security/xrd/xrdcert.pem'
         core.config['certs.xrootdkey'] = '/etc/grid-security/xrd/xrdkey.pem'
         core.config['xrootd.config'] = '/etc/xrootd/xrootd-clustered.cfg'
+        core.config['xrootd.port'] = XROOTD_PORT
         core.config['xrootd.gsi'] = "ON"
         core.state['xrootd.started-server'] = False
         core.state['xrootd.backups-exist'] = False
@@ -58,7 +63,7 @@ def test_01_start_xrootd(self):
                             owner="xrootd",
                             chown=(user.pw_uid, user.pw_gid))
 
-            files.append(core.config['xrootd.config'], XROOTD_CFG_TEXT % sec_protocol, owner='xrootd', backup=True)
+            files.append(core.config['xrootd.config'], XROOTD_CFG_TEXT % (sec_protocol, core.config['xrootd.port']), owner='xrootd', backup=True)
             authfile = '/etc/xrootd/auth_file'
             files.write(authfile, AUTHFILE_TEXT, owner="xrootd", chown=(user.pw_uid, user.pw_gid))
 

osgtest/tests/test_450_xrootd.py

@@ -30,7 +30,7 @@ def test_01_xrdcp_local_to_server(self):
         else:
             temp_dir = tempfile.mkdtemp()
         os.chmod(temp_dir, 0o777)
-        xrootd_url = 'root://%s/%s/copied_file.txt' % (hostname, temp_dir)
+        xrootd_url = 'root://%s:%d/%s/copied_file.txt' % (hostname, core.config['xrootd.port'], temp_dir)
         command = ('xrdcp', '--debug', '3', TestXrootd.__data_path, xrootd_url)
 
         status, stdout, stderr = core.system(command, user=True)
@@ -57,7 +57,7 @@ def test_02_xrdcp_server_to_local(self):
         f = open(temp_source_dir + "/copied_file.txt", "w")
         f.write("This is some test data for an xrootd test.")
         f.close()
-        xrootd_url = 'root://%s/%s/copied_file.txt' % (hostname, temp_source_dir)
+        xrootd_url = 'root://%s:%d/%s/copied_file.txt' % (hostname, core.config['xrootd.port'], temp_source_dir)
         local_path = temp_target_dir + '/copied_file.txt'
         command = ('xrdcp', '--debug', '3', xrootd_url, local_path)