Log errors creating GeoGig index

geoserver · Mar 16, 2017 · faa97c1 · faa97c1
1 parent e66d2ec
commit faa97c1
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/src/community/geogig/src/main/java/org/geogig/geoserver/wms/GeoGigCatalogVisitor.java b/src/community/geogig/src/main/java/org/geogig/geoserver/wms/GeoGigCatalogVisitor.java
@@ -4,13 +4,13 @@
  */
 package org.geogig.geoserver.wms;
 
-import java.io.IOException;
 import java.util.Arrays;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Stream;
 
 import org.geoserver.catalog.Catalog;
+import org.geoserver.catalog.CatalogException;
 import org.geoserver.catalog.CatalogVisitor;
 import org.geoserver.catalog.CoverageInfo;
 import org.geoserver.catalog.CoverageStoreInfo;
@@ -97,9 +97,14 @@ public void visit(LayerInfo layer) {
             final StoreInfo store = resource.getStore();
             if (GeoGigDataStoreFactory.DISPLAY_NAME.equals(store.getType())) {
                 // it's a GeoGig dataStore
+                GeoGigDataStore geogigDataStore = null;
                 try {
-                    final GeoGigDataStore geogigDataStore = GeoGigDataStore.class.cast(
+                    geogigDataStore = GeoGigDataStore.class.cast(
                             ((DataStoreInfo) store).getDataStore(null));
+                } catch (Exception ex) {
+                    throw new CatalogException("Error accessing GeoGig DataStore", ex);
+                }
+                try {
                     if (!geogigDataStore.getAutoIndexing()) {
                         if (LOGGER.isLoggable(Level.FINE)) {
                             LOGGER.fine(String.format("GeoGig DataStore is not configured for automatic indexing."));
@@ -114,9 +119,11 @@ public void visit(LayerInfo layer) {
                     String[] dimensions = Stream.concat(Arrays.stream(timeAttr), Arrays.stream(elevationAttr))
                             .toArray(String[]::new);
                     // create the indexes
-                    geogigDataStore.createOrUpdateIndex(resource.getNativeName(), dimensions);
-                } catch (IOException ioe) {
-                    throw new RuntimeException(ioe);
+                    geogigDataStore.createOrUpdateIndex(resource.getName(), dimensions);
+                } catch (Exception ex) {
+                    // Something went wrong creating the index, log it and move on
+                    LOGGER.log(Level.WARNING, "Index could not be created or updated on Layer: " +
+                            resource.getNativeName(), ex);
                 }
             }
         }

diff --git a/src/community/geogig/src/test/java/org/geogig/geoserver/wms/GeoGigCatalogVisitorTest.java b/src/community/geogig/src/test/java/org/geogig/geoserver/wms/GeoGigCatalogVisitorTest.java
@@ -68,7 +68,7 @@ public void after() {
     }
 
     @Test
-    public void testGetAttribute3() throws Exception {
+    public void testGetAttribute_SapitalIndexOnly() throws Exception {
         addAvailableGeogigLayers();
         Catalog catalog = getCatalog();
         GeoGigTestData.CatalogBuilder catalogBuilder = geogigData.newCatalogBuilder(catalog);
@@ -87,7 +87,7 @@ public void testGetAttribute3() throws Exception {
     }
 
     @Test
-    public void testGetAttribute2() throws Exception {
+    public void testGetAttribute_SpatialIndexWithExtraAttributes() throws Exception {
         addAvailableGeogigLayers();
         Catalog catalog = getCatalog();
         GeoGigTestData.CatalogBuilder catalogBuilder = geogigData.newCatalogBuilder(catalog);

diff --git a/...ity/geogig/src/test/java/org/geogig/geoserver/wms/GeogigLayerIntegrationListenerTest.java b/...ity/geogig/src/test/java/org/geogig/geoserver/wms/GeogigLayerIntegrationListenerTest.java
@@ -7,7 +7,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.locationtech.geogig.geotools.data.GeoGigDataStoreFactory.REPOSITORY;
-import static org.locationtech.geogig.model.impl.RevObjectTestSupport.hashString;
 
 import java.io.Serializable;
 import java.util.List;
@@ -60,6 +59,9 @@ protected void onSetUp(SystemTestData testData) throws Exception {
                 "l2=geom:LINESTRING(0 0, 180 0)");
 
         geogigData.add().commit("Added test features");
+
+        // add a branch for the explicit HEAD test
+        geogigData.branch("fakeBranch");
         // need to instantiate the listerner so it can register with the test GeoServer instance
         new GeogigLayerIntegrationListener(getGeoServer());
 
@@ -128,9 +130,7 @@ public void testAddGeogigLayerAddsLayerIdentifierWithExplicitHead() {
         CatalogBuilder catalogBuilder = geogigData.newCatalogBuilder(catalog);
         DataStoreInfo store = catalog.getDataStoreByName(catalogBuilder.storeName());
 
-        final String fakeHead = hashString("something").toString();
-
-        store.getConnectionParameters().put(GeoGigDataStoreFactory.HEAD.key, fakeHead);
+        store.getConnectionParameters().put(GeoGigDataStoreFactory.HEAD.key, "fakeBranch");
         catalog.save(store);
 
         String layerName = catalogBuilder.workspaceName() + ":points";