Changeset 948

Timestamp:

02/20/10 17:19:34 (7 months ago)

Author:

arneke

Message:

Seeding changes in GeoRSS , terminate old jobs before starting new ones

Location:

trunk

Files:

• documentation/en/user/source/configuration/xml/exhaustive.rst (modified) (1 diff)
• geowebcache/src/main/java/org/geowebcache/georss/GeoRSSPollTask.java (modified) (4 diffs)
• geowebcache/src/main/java/org/geowebcache/rest/GWCTask.java (modified) (1 diff)
• geowebcache/src/main/resources/org/geowebcache/config/geowebcache.xsd (modified) (1 diff)

trunk/documentation/en/user/source/configuration/xml/exhaustive.rst

@@ -196 +196 @@
              <format>image/png</format>
              <!-- OPTIONAL If the operation is not truncate, specify how many threads
-                  should run in parallel? Note that each format is done sequencially. -->
+                  should run in parallel? Note that multiple formats are done in parallel,
+                  so if you say 2 threads and the layer has 3 formats (and the geoRSsFeed 
+                  does not specify a format), then the total number of threads will be 
+                  3x2 = 6 -->
              <seedingThreads>2</seedingThreads>
              <!-- OPTIONAL GWC will render the geometries onto a bitmask and use that

trunk/geowebcache/src/main/java/org/geowebcache/georss/GeoRSSPollTask.java

@@ -39 +39 @@
 import org.geowebcache.mime.MimeType;
 import org.geowebcache.rest.GWCTask;
+import org.geowebcache.rest.GWCTask.STATE;
 import org.geowebcache.rest.seed.RasterMask;
 import org.geowebcache.rest.seed.SeedRestlet;
@@ -74 +75 @@
 
     private final SeedRestlet seedRestlet;
+    
+    private LinkedList<GWCTask> seedTasks;
 
     /**
@@ -246 +249 @@
         
         Iterator<MimeType> mimeIter = mimeList.iterator();
-
-        // We do the truncate synchronously to get rid of stale data as quick as we can
+        
+        // Ask any existing seed jobs started by this feed to terminate
+        stopSeeding(true);
+
+        // We do the truncate synchronously to get rid of stale data as quickly as we can
         while(mimeIter.hasNext()) {
             DiscontinuousTileRange dtr = new DiscontinuousTileRange(layer.getName(), gridSetId, 
@@ -272 +278 @@
             
             final int seedingThreads = pollDef.getSeedingThreads();
-            GWCTask[] seedTasks;
-            seedTasks = seedRestlet.createTasks(dtr, layer, GWCTask.TYPE.SEED, seedingThreads, false);
-            seedRestlet.dispatchTasks(seedTasks);
+            GWCTask[] tasks = seedRestlet.createTasks(dtr, layer, GWCTask.TYPE.SEED, seedingThreads, false);
+            seedRestlet.dispatchTasks(tasks);
+            
+            // Save the handles so we can stop them
+            for (GWCTask task : tasks) {
+                seedTasks.add(task);
+            }
+
+        }
+    }
+    
+    protected void stopSeeding(boolean checkLiveCount) {
+        if(this.seedTasks != null) {
+            int liveCount = 0;
+            for (GWCTask task : seedTasks) {
+                if(task.getState() != STATE.DEAD || task.getState() != STATE.DONE) {
+                    task.terminateNicely();
+                    liveCount++;
+                }
+            }
+            
+            try {
+                logger.debug("Found " + liveCount + " running seed threads. Waiting 3s for them to terminate.");
+                Thread.sleep(3000);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+            
+            if(! checkLiveCount) {
+                return;
+            }
+            
+            liveCount = 0;
+            Iterator<GWCTask> iter = seedTasks.iterator();
+            while(iter.hasNext()) {
+                GWCTask task = iter.next();
+                if(task.getState() != STATE.DEAD || task.getState() != STATE.DONE) {
+                    liveCount++;  
+                } else {
+                    iter.remove();
+                }
+            }
+            logger.debug(liveCount + " seed jobs are still waiting to terminate, proceeding anyway.");
+            
+        } else {
+            logger.debug("Found no running seed jobs");
         }
     }

trunk/geowebcache/src/main/java/org/geowebcache/rest/GWCTask.java

@@ -113 +113 @@
         return type;
     }
+    
+    public STATE getState() {
+        return state;
+    }
 }

trunk/geowebcache/src/main/resources/org/geowebcache/config/geowebcache.xsd

@@ -955 +955 @@
     <xs:element name="seedingThreads" type="xs:integer" minOccurs="0">
       <xs:annotation><xs:documentation xml:lang="en">
-        This controls the number of threads to use while seeding, provided the
-        operation is reseed. Note that the truncate is synchronous and single threaded.
+        This controls the number of threads to use per format while seeding, 
+        provided the operation is seed or reseed. (Truncate is synchronous 
+        and single threaded.) So if you write 2 threads here, and the layer 
+        supports 3 formats, and no format is specified above, then the total
+        number of threads will be 3x2 = 6
       </xs:documentation></xs:annotation>
     </xs:element>