Merge pull request #139 from matyasselmeci/pr/SOFTWARE-4511.remove-rsv

Remove RSV (SOFTWARE-4511)

Author: matyasselmeci

README.md

@@ -155,7 +155,7 @@ This section is contained in `/etc/osg/config.d/10-gateway.ini` which is provide
 
 | Option                         | Values Accepted | Explanation                                                                                                                                                                              |
 |--------------------------------|-----------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **htcondor\_gateway\_enabled** | `True`, `False` | (default True). True if the CE is using HTCondor-CE, False otherwise. HTCondor-CE will be configured to support enabled batch systems. RSV will use HTCondor-CE to launch remote probes. |
+| **htcondor\_gateway\_enabled** | `True`, `False` | (default True). True if the CE is using HTCondor-CE, False otherwise. HTCondor-CE will be configured to support enabled batch systems. |
 | **job\_envvar\_path**          | String          | The value of the PATH environment variable to put into HTCondor jobs running with HTCondor-CE. This value is ignored if not using that batch system/gateway combination.                 |
 
 
@@ -320,7 +320,6 @@ This section is contained in `/etc/osg/config.d/30-gratia.ini` which is provided
 **Note for probes:**<br>
 Legal values for the `probe_type` part are:
 
--   `metric` (for RSV)
 -   `jobmanager` (for the appropriate jobmanager probe)
 -   `gridftp` (for the GridFTP transfer probe)
 

config/10-gateway.ini

@@ -10,16 +10,12 @@
 ; HTCondor-CE (from the htcondor-ce package).
 ;
 ; In addition to enabling the gateways on a CE, these settings are
-; used to tell other services, such as the various job managers and
-; RSV, which gateways are being used.
+; used to tell other services, such as the various job managers
+; which gateways are being used.
 ;
 ; This setting configures the services that use the gateway to
 ; use HTCondor-CE. The following things will happen if this is
 ; set to True:
-;   - RSV will be configured to use HTCondor-CE (via Condor-G) to
-;     run remote probes.
-;   - RSV will be configured to run probes that test the
-;     functionality of condor-ce.
 ;   - HTCondor-CE will be configured to work with the job managers
 ;     that are enabled in the other config files.
 htcondor_gateway_enabled = True

config/30-rsv.ini

@@ -31,15 +31,6 @@ def requirements_are_installed():
 class GratiaConfiguration(BaseConfiguration):
     """Class to handle attributes and configuration related to gratia services"""
 
-    metric_probe_deprecation = """WARNING:
-The metric probe should no longer be configured using 'probes' option in the 
-[Gratia] section. All OSG installations will automatically report to the GOC 
-RSV collector.  If you want to send to a different collector use the 
-'gratia_collector' option in the [RSV] section and specify the 
-hostname:port of the desired collector.  If you do not understand what to 
-do then just remove the metric probe specification in the 'probes' option 
-in your config.ini file."""
-
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.logger = logging.getLogger(__name__)
@@ -336,9 +327,6 @@ def _check_servers(self):
         """
         valid = True
         for probe in self.enabled_probe_hosts:
-            if probe == 'metric':
-                sys.stdout.write(self.metric_probe_deprecation + "\n")
-                self.log(self.metric_probe_deprecation, level=logging.WARNING)
             server = self.enabled_probe_hosts[probe].split(':')[0]
             if not validation.valid_domain(server, False):
                 err_mesg = "The server specified for probe %s is not " % probe
@@ -374,6 +362,10 @@ def _set_enabled_probe_host(self, probes):
             probe_name = tmp[0].strip()
             if probe_name == 'gridftp':
                 probe_name = 'gridftp-transfer'
+            if probe_name == 'metric':
+                self.log("The 'metric' probe is not supported",
+                         level=logging.WARNING)
+                continue
             if len(tmp[1:]) == 1:
                 self.enabled_probe_hosts[probe_name] = tmp[1]
             else: