Merge pull request #197 from apel/release-1.8.1

Release 1.8.1 to master

.travis.yml

@@ -8,6 +8,13 @@ matrix:
     - python: "nightly"
   fast_finish: true
 
+# MySQL doesn't start automatically in newer build environments
+services:
+  - mysql
+
+# Pin Ubuntu to Trusty for the moment for Python 2.6 support
+dist: trusty
+
 # Cache the dependencies installed by pip
 cache: pip
 # Avoid pip log from affecting cache

CHANGELOG

@@ -1,5 +1,9 @@
 Changelog for apel
 ==================
+ * Wed Jul 03 2019 Adrian Coveney <adrian.coveney@stfc.ac.uk> - 1.8.1-1
+ - [client] Added option to update benchmarks/spec levels using a local
+   configuration option rather than the BDII.
+
  * Mon Jan 07 2019 Adrian Coveney <adrian.coveney@stfc.ac.uk> - 1.8.0-1
  - [client] Added warning in log if no records are unloaded during a run.
  - [parsers] Added optional 'cputmult' factor to HTCondor parser to support its

CODEOWNERS

@@ -0,0 +1,5 @@
+# These owners will be the default owners for everything in the repo, unless a
+# later match is added and takes precedence. They will be requested for review
+# when someone opens a pull request.
+
+*    @apel/code-reviewers

apel.spec

@@ -4,7 +4,7 @@
 %endif
 
 Name:           apel
-Version:        1.8.0
+Version:        1.8.1
 %define releasenumber 1
 Release:        %{releasenumber}%{?dist}
 Summary:        APEL packages
@@ -199,6 +199,10 @@ exit 0
 # ==============================================================================
 
 %changelog
+ * Wed Jul 03 2019 Adrian Coveney <adrian.coveney@stfc.ac.uk> - 1.8.1-1
+ - [client] Added option to update benchmarks/spec levels using a local
+   configuration option rather than the BDII.
+
  * Mon Jan 07 2019 Adrian Coveney <adrian.coveney@stfc.ac.uk> - 1.8.0-1
  - [client] Added warning in log if no records are unloaded during a run.
  - [parsers] Added optional 'cputmult' factor to HTCondor parser to support its

apel/__init__.py

@@ -15,4 +15,4 @@
    
    @author Konrad Jopek, Will Rogers
 '''
-__version__ = (1, 8, 0)
+__version__ = (1, 8, 1)

bin/client.py

@@ -206,6 +206,40 @@ def run_client(ccp):
         log.info(LOG_BREAK)
         sys.exit(1)
 
+    log.info('Running manual spec update.')
+    specs = []
+    index = 1
+    while True:
+        key = 'manual_spec' + str(index)
+        try:
+            spec = ccp.get('spec_updater', key)
+        except ConfigParser.NoOptionError:
+            break
+        specs.append(spec)
+        index += 1
+
+    if len(specs) > 0:
+        try:
+            s = ccp.get('spec_updater', 'site_name')
+        except ConfigParser.NoOptionError:
+            log.error('Site name must be configured '
+                      'for manual_spec definitions.')
+            sys.exit(1)
+        for spec in specs:
+            parts = spec.split(',')
+            if len(parts) != 3:
+                log.warn('Check manual_spec definitions.')
+            try:
+                sl = float(parts[2])
+            except ValueError:
+                log.error('Service level must be a number '
+                          'for manual_spec definitions.')
+                sys.exit(1)
+            ce = parts[0]
+            slt = parts[1]
+            db.update_spec(s, ce, slt, sl)
+    log.info('Manual spec update finished. %s updated.', len(specs))
+
     if spec_updater_enabled:
         log.info(LOG_BREAK)
         log.info('Starting spec updater.')

conf/client.cfg

@@ -25,6 +25,14 @@ ldap_port = 2170
 #spec_type = HEPSPEC
 #spec_value = 1.0
 
+## To manually set specs for all jobs (not just local ones), configure lines
+## like the following named "manual_spec" followed by consecutive integers for
+## however many batch systems are relevant. The value should be a unique name
+## for the system, then the spec type ('HEPSPEC' or 'Si2k') and the spec value.
+# manual_spec1 = grid10.uni.ac.uk:1234/grid10.uni.ac.uk-condor,HEPSPEC,10.0
+# manual_spec2 = grid22.uni.ac.uk:1234/grid22.uni.ac.uk-condor,HEPSPEC,15.0
+# manual_spec3 = grid35.uni.ac.uk:1234/grid35.uni.ac.uk-condor,HEPSPEC,15.0
+
 [joiner]
 enabled = true
 local_jobs = false

scripts/apel-build-rpm

@@ -12,7 +12,7 @@
 rpmdev-setuptree
 
 RPMDIR=/home/rpmb/rpmbuild
-VERSION=1.8.0-1
+VERSION=1.8.1-1
 APELDIR=apel-$VERSION
 
 # Remove old sources and RPMS