disable NetCDF metadata extraction for S3 direct upload #9601

IQSS · May 23, 2023 · 6838fdf · 6838fdf
1 parent bef00db
commit 6838fdf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIO.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIO.java
@@ -815,6 +815,7 @@ String getMainFileKey() throws IOException {
         if (key == null) {
             DataFile df = this.getDataFile();
             // TODO: (?) - should we worry here about the datafile having null for the owner here? 
+            // Yes, df.getOwner() can be null during S3 direct upload
             key = getMainFileKey(df.getOwner(), df.getStorageIdentifier(), driverId);
         }
         return key;

diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java
@@ -1197,7 +1197,12 @@ public boolean fileMetadataExtractableFromNetcdf(DataFile dataFile, Path tempLoc
             StorageIO<DataFile> storageIO;
             try {
                 storageIO = dataFile.getStorageIO();
-                storageIO.open();
+                try {
+                    storageIO.open();
+                } catch (Exception ex) {
+                    logger.fine("fileMetadataExtractableFromNetcdf skipped because of exception calling dataFile.getStorageIO(): " + ex);
+                    return false;
+                }
                 if (storageIO.isLocalFile()) {
                     localFile = storageIO.getFileSystemPath().toFile();
                     dataFileLocation = localFile.getAbsolutePath();