pool: Do not save terminated jobs to setup file

Without this patch, cancelled permanent jobs will resurrect after a pool restart. Also fixes the 'migration clear' command to remove failed jobs too. Target: trunk Request: 2.7 Request: 2.6 Require-book: no Require-notes: yes Acked-by: Paul Millar <paul.millar@desy.de> Patch: http://rb.dcache.org/r/6420/
dCache · Jan 21, 2014 · 9ba476a · 9ba476a
1 parent 3475087
commit 9ba476a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/modules/dcache/src/main/java/org/dcache/pool/migration/Job.java b/modules/dcache/src/main/java/org/dcache/pool/migration/Job.java
@@ -79,13 +79,13 @@ public class Job
     enum State { INITIALIZING, RUNNING, SLEEPING, PAUSED, SUSPENDED,
             STOPPING, CANCELLING, CANCELLED, FINISHED, FAILED }
 
-    private final static Logger _log = LoggerFactory.getLogger(Job.class);
+    private static final Logger _log = LoggerFactory.getLogger(Job.class);
 
-    private final Set<PnfsId> _queued = new LinkedHashSet();
-    private final Map<PnfsId,Long> _sizes = new HashMap();
-    private final Map<PnfsId,Task> _running = new HashMap();
+    private final Set<PnfsId> _queued = new LinkedHashSet<>();
+    private final Map<PnfsId,Long> _sizes = new HashMap<>();
+    private final Map<PnfsId,Task> _running = new HashMap<>();
     private final Future<?> _refreshTask;
-    private final BlockingQueue<Error> _errors = new ArrayBlockingQueue(15);
+    private final BlockingQueue<Error> _errors = new ArrayBlockingQueue<>(15);
     private final Map<PoolMigrationJobCancelMessage,DelayedReply> _cancelRequests =
         new HashMap<>();
 
@@ -201,7 +201,7 @@ public synchronized void getInfo(PrintWriter pw)
 
         pw.println("Concurrency: " + _concurrency);
         pw.println("Running tasks:");
-        List<Task> tasks = new ArrayList(_running.values());
+        List<Task> tasks = new ArrayList<>(_running.values());
         Collections.sort(tasks, new Comparator<Task>() {
                 @Override
                 public int compare(Task t1, Task t2)

diff --git a/modules/dcache/src/main/java/org/dcache/pool/migration/MigrationModule.java b/modules/dcache/src/main/java/org/dcache/pool/migration/MigrationModule.java
@@ -944,6 +944,7 @@ public String call()
                 Job job = i.next();
                 switch (job.getState()) {
                 case CANCELLED:
+                case FAILED:
                 case FINISHED:
                     i.remove();
                     _commands.remove(job);
@@ -1054,7 +1055,17 @@ public synchronized void printSetup(PrintWriter pw)
         pw.println("#\n# MigrationModule\n#");
         for (Job job: _jobs.values()) {
             if (job.getDefinition().isPermanent) {
-                pw.println(_commands.get(job));
+                switch (job.getState()) {
+                case CANCELLED:
+                case CANCELLING:
+                case STOPPING:
+                case FAILED:
+                case FINISHED:
+                    break;
+                default:
+                    pw.println(_commands.get(job));
+                    break;
+                }
             }
         }
     }