Merge pull request #2237 from opencb/TASK-3796

TASK-3796 - Migration 'add_cellbase_data_release' failed with message: Error executing operation configureCellbase
opencb · Jan 23, 2023 · 74c5255 · 74c5255
2 parents f0f95a6 + b66ddc2
commit 74c5255
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/...rc/main/java/org/opencb/opencga/app/migrations/v2_6_0/storage/AddCellbaseDataRelease.java b/...rc/main/java/org/opencb/opencga/app/migrations/v2_6_0/storage/AddCellbaseDataRelease.java
@@ -36,18 +36,29 @@ protected void run() throws Exception {
                     cellbase.setDataRelease(cellBaseUtils.getDataRelease());
                     updateCellbase = true;
                 } else {
+                    String serverVersion;
+                    try {
+                        serverVersion = cellBaseUtils.getVersionFromServer();
+                    } catch (Exception e) {
+                        if (cellBaseUtils.getVersion().equals("v4")) {
+                            logger.debug(e.getMessage(), e);
+                            logger.warn(e.getMessage(), e);
+                            logger.info("DataRelease not supported on version '" + cellBaseUtils.getVersion() + "' . Leaving empty");
+                            continue;
+                        }
+                        throw e;
+                    }
                     if (cellBaseUtils.supportsDataRelease()) {
                         cellbase.setDataRelease("1");
                         updateCellbase = true;
                     } else {
-                        String serverVersion = cellBaseUtils.getVersionFromServer();
                         logger.info("DataRelease not supported on version '" + serverVersion + "' . Leaving empty");
                     }
                 }
             }
             if (updateCellbase) {
                 logger.info("Update cellbase info for project '{}' with '{}'", projectFqn, cellBaseUtils);
-                variantStorageManager.setCellbaseConfiguration(projectFqn, null, false, null, token);
+                variantStorageManager.setCellbaseConfiguration(projectFqn, cellbase, false, null, token);
             }
         }
     }

diff --git a/.../main/java/org/opencb/opencga/catalog/auth/authorization/CatalogAuthorizationManager.java b/.../main/java/org/opencb/opencga/catalog/auth/authorization/CatalogAuthorizationManager.java
@@ -102,6 +102,9 @@ public boolean isPublicRegistration() {
 
     @Override
     public void checkCanEditProject(long projectId, String userId) throws CatalogException {
+        if (isInstallationAdministrator(userId)) {
+            return;
+        }
         if (projectDBAdaptor.getOwnerId(projectId).equals(userId)) {
             return;
         }