Retire the NetApp disk

doc/deploy.rst

@@ -52,7 +52,7 @@ files used for a basic web service. Run ``make_web_service`` with no
 arguments for further help.
 
 .. note::
-   ``make_web_service`` should be run on a local disk (**not** /netapp). Most
+   ``make_web_service`` should be run on a local disk (**not** /wynton). Most
    users on `modbase` have their home directories on a local disk, so this is
    generally OK by default. Note that the home directory should be accessible
    by the backend user in order for the build system to work; running

examples/example.conf

@@ -21,7 +21,7 @@ frontend_config: frontend.conf
 [directories]
 install: /modbase1/home/modfoo/
 incoming: /modbase1/home/modfoo/incoming/
-preprocessing: /netapp/sali/modfoo/running/
+preprocessing: /wynton/home/sali/modfoo/running/
 completed: /modbase1/home/modfoo/completed/
 failed: /modbase1/home/modfoo/failed/
 

perl/saliweb/frontend.pm

@@ -370,7 +370,7 @@ require Exporter;
              sanitize_filename);
 
 # Location of our PDB mirror.
-our $pdb_root = "/netapp/database/pdb/remediated/pdb/";
+our $pdb_root = "/wynton/home/database/pdb/remediated/pdb/";
 
 use File::Spec;
 use DBI;

python/saliweb/backend/__init__.py

@@ -1327,9 +1327,9 @@ def __set_state(self, state):
                 # The only way to go into INCOMING state is from the FAILED
                 # state (via resubmit). Since it's going to go from there back
                 # to running, and the failed/running directories are often
-                # on netapp (while incoming has to be on modbase) avoid
-                # a potentially expensive copy from netapp to modbase and
-                # then back to netapp by cheating and putting the job in
+                # on cluster storage (while incoming has to be on modbase) avoid
+                # a potentially expensive copy from network to modbase and
+                # then back to network by cheating and putting the job in
                 # the PREPROCESSING directory already.
                 directory = os.path.join(
                                  self._db.config.directories['PREPROCESSING'],

python/saliweb/build/__init__.py

@@ -338,10 +338,10 @@ def _check_directory_locations(env):
             env.Exit(1)
 
     running = env['config'].directories['RUNNING']
-    if not running.startswith('/netapp') and not running.startswith('/wynton'):
+    if not running.startswith('/wynton'):
         print("""
 ** The RUNNING directory is set to %s.
-** It must be on a cluster-accessible disk (i.e. /netapp or /wynton).
+** It must be on a cluster-accessible disk (i.e. /wynton).
 """ % running, file=sys.stderr)
         env.Exit(1)
 
@@ -468,7 +468,7 @@ def _check_permissions(env):
 ** Cannot write to .scons directory: %s
 ** The backend user needs to be able to write to this directory.
 ** To fix this problem, make sure that your checkout is on a local disk
-** (e.g. /modbase1, /modbase2, etc., not /netapp) and run
+** (e.g. /modbase1, /modbase2, etc., not /wynton) and run
    setfacl -m u:%s:rwx .scons
 """ % (str(detail), env['config'].backend['user']), file=sys.stderr)
         env.Exit(1)
@@ -508,7 +508,7 @@ def _check_permissions(env):
 ** Cannot read database configuration file: %s
 ** The backend user needs to be able to read this file.
 ** To fix this problem, make sure that your checkout is on a local disk
-** (e.g. /modbase1, /modbase2, etc., not /netapp) and run
+** (e.g. /modbase1, /modbase2, etc., not /wynton) and run
    setfacl -m u:%s:r %s
 """ % (str(detail), env['config'].backend['user'], conf), file=sys.stderr)
             env.Exit(1)

test/backend/test_job.py

@@ -766,7 +766,7 @@ def test_ok_resubmit(self):
         # Can only resubmit FAILED jobs
         self.assertRaises(InvalidStateError, job.resubmit)
         # Resubmitted FAILED jobs actually go into the PREPROCESSING directory
-        # (to avoid a potentially expensive move from netapp to modbase
+        # (to avoid a potentially expensive move from Wynton to modbase
         # and back again)
         prejobdir = os.path.join(conf.directories['PREPROCESSING'], 'job1')
         self.assertEqual(job.directory, prejobdir)

test/build/test_check.py

@@ -308,7 +308,7 @@ def make_env(install, incoming, running):
         # Incoming/install on local disk, running on cluster disk is OK
         for disk in ('/var', '/usr', '/home', '/modbase1', '/modbase2',
                      '/modbase3', '/modbase4', '/modbase5'):
-            for cluster in ('/netapp/ok', '/wynton/home/ok'):
+            for cluster in ('/wynton/home/ok',):
                 env = make_env(disk, disk, cluster)
                 ret, stderr = run_catch_stderr(
                                saliweb.build._check_directory_locations, env)
@@ -317,9 +317,9 @@ def make_env(install, incoming, running):
                 self.assertEqual(stderr, '')
 
         # Incoming/install on a network disk is NOT OK
-        for disk in ('/guitar1', '/netapp', '/salilab'):
-            env1 = make_env('/var', disk, '/netapp/ok')
-            env2 = make_env(disk, '/var', '/netapp/ok')
+        for disk in ('/guitar1', '/wynton', '/salilab'):
+            env1 = make_env('/var', disk, '/wynton/ok')
+            env2 = make_env(disk, '/var', '/wynton/ok')
             for (name, env) in (('INCOMING', env1), ('install', env2)):
                 ret, stderr = run_catch_stderr(
                                saliweb.build._check_directory_locations, env)
@@ -330,7 +330,7 @@ def make_env(install, incoming, running):
                                  '.\n** It must be on a local disk '
                                  '(e.g. /modbase1).\n\n')
 
-        # Running on a non-netapp disk is NOT OK
+        # Running on a non-Wynton disk is NOT OK
         for disk in ('/var', '/usr', '/home', '/modbase1', '/modbase2',
                      '/modbase3', '/modbase4', '/modbase5', '/guitar1',
                      '/salilab'):
@@ -342,7 +342,7 @@ def make_env(install, incoming, running):
             self.assertEqual(stderr, '\n** The RUNNING directory is set to ' \
                              + disk + \
                              '.\n** It must be on a cluster-accessible disk '
-                             '(i.e. /netapp or /wynton).\n\n')
+                             '(i.e. /wynton).\n\n')
 
     @testutil.run_in_tempdir
     def test_check_directory_permissions(self):