gCubeSystem
/
storagehub
15
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

moved to new ceph storage

This commit is contained in:
lucio 2024-01-19 12:20:19 +01:00
parent f75f7d86d9
commit c4d5cffe02
9 changed files with 60 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
.settings/org.eclipse.wst.common.component
View File

@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
@ -31,7 +34,10 @@
<wb-module deploy-name="storagehub">
@ -63,7 +69,10 @@
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
@ -95,7 +104,10 @@
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
@ -127,7 +139,10 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
@ -136,10 +151,16 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<dependent-module archiveName="common-scope-2.0.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/common-scope/common-scope">
<dependent-module archiveName="storagehub-model-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/storagehub-model/storagehub-model">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="storagehub-script-utils-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/storagehub-scripting-util/storagehub-scripting-util">
<dependency-type>uses</dependency-type>
</dependent-module>
@ -171,7 +192,10 @@
<property name="context-root" value="storagehub"/>
@ -203,7 +227,10 @@
<property name="java-output-path" value="/storagehub-webapp_BRANCH/target/classes"/>
@ -235,7 +262,10 @@
</wb-module>

6
docker/storage-settings.properties
View File

@ -16,8 +16,4 @@ default.createBucket=false
volatile.bucketName=shub-volatile-dev
volatile.key=18eb719ebffb4cd0ab78f9343f8aedd2
volatile.secret=e7b6178dd61d4e0dbbc37ff7cb941aed
volatile.url=https://isti-cloud.isti.cnr.it:13808/
gcube-minio.key=SHUBTEST
gcube-minio.secret=wJalrXUtnFEMI/K7MDENG/bPxRfiCY
gcube-minio.url=http://minio:9000
gcube-minio.createBucket=true
volatile.url=https://isti-cloud.isti.cnr.it:13808/

2
pom.xml
View File

@ -39,7 +39,7 @@
<dependency>
<groupId>org.gcube.distribution</groupId>
<artifactId>gcube-smartgears-bom</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>

4
src/main/java/org/gcube/data/access/storagehub/handlers/DownloadHandler.java
View File

@ -148,8 +148,8 @@ public class DownloadHandler {
}catch (StorageIdNotFoundException e) {
//TODO: temporary code, it will last until the MINIO porting will not finish
if (sbf.getName().equals(Constants.MONGO_STORAGE)) {
sbf = storageBackendHandler.get(Constants.DEFAULT_MINIO_STORAGE);
sbf.create(new PayloadBackend(Constants.DEFAULT_MINIO_STORAGE, null));
sbf = storageBackendHandler.get(Constants.DEFAULT_S3_STORAGE);
sbf.create(new PayloadBackend(Constants.DEFAULT_S3_STORAGE, null));
} else
throw e;
}

2
src/main/java/org/gcube/data/access/storagehub/handlers/plugins/StorageBackendHandler.java
View File

@ -22,7 +22,7 @@ public class StorageBackendHandler {
private static Logger log = LoggerFactory.getLogger(StorageBackendHandler.class);
public static PayloadBackend getDefaultPayloadForFolder() {
return new PayloadBackend(Constants.DEFAULT_MINIO_STORAGE, null);
return new PayloadBackend(Constants.DEFAULT_S3_STORAGE, null);
}
@Inject

6
src/main/java/org/gcube/data/access/storagehub/health/DefaultStorageCheck.java
View File

@ -5,7 +5,7 @@ import org.gcube.common.health.api.ReadinessChecker;
import org.gcube.common.health.api.response.HealthCheckResponse;
import org.gcube.common.storagehub.model.items.nodes.PayloadBackend;
import org.gcube.data.access.storagehub.handlers.plugins.StorageBackendHandler;
import org.gcube.data.access.storagehub.storage.backend.impl.GcubeDefaultMinIoStorageBackendFactory;
import org.gcube.data.access.storagehub.storage.backend.impl.GcubeDefaultS3StorageBackendFactory;
import org.gcube.data.access.storagehub.storage.backend.impl.S3Backend;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -25,7 +25,7 @@ public class DefaultStorageCheck implements HealthCheck{
@Override
public HealthCheckResponse check() {
try {
GcubeDefaultMinIoStorageBackendFactory storageFactory =new GcubeDefaultMinIoStorageBackendFactory();
GcubeDefaultS3StorageBackendFactory storageFactory =new GcubeDefaultS3StorageBackendFactory();
storageFactory.init();
if (((S3Backend)storageFactory.create(defaultPayload)).isAlive())
return HealthCheckResponse.builder(getName()).up().build();
@ -37,7 +37,5 @@ public class DefaultStorageCheck implements HealthCheck{
}
}
}

8
src/main/java/org/gcube/data/access/storagehub/storage/backend/impl/GcubeDefaultMinIoStorageBackendFactory.java → src/main/java/org/gcube/data/access/storagehub/storage/backend/impl/GcubeDefaultS3StorageBackendFactory.java
View File

@ -18,7 +18,7 @@ import org.gcube.common.storagehub.model.storages.StorageBackend;
import org.gcube.common.storagehub.model.storages.StorageBackendFactory;
@Singleton
public class GcubeDefaultMinIoStorageBackendFactory implements StorageBackendFactory {
public class GcubeDefaultS3StorageBackendFactory implements StorageBackendFactory {
private StorageBackend singleton;
@ -33,7 +33,7 @@ public class GcubeDefaultMinIoStorageBackendFactory implements StorageBackendFac
@Override
public String getName() {
return Constants.DEFAULT_MINIO_STORAGE;
return Constants.DEFAULT_S3_STORAGE;
}
@Override
@ -50,7 +50,7 @@ public class GcubeDefaultMinIoStorageBackendFactory implements StorageBackendFac
}
private Metadata getParameters(){
try (InputStream input = GcubeDefaultMinIoStorageBackendFactory.class.getClassLoader().getResourceAsStream("storage-settings.properties")) {
try (InputStream input = GcubeDefaultS3StorageBackendFactory.class.getClassLoader().getResourceAsStream("storage-settings.properties")) {
Properties prop = new Properties();
@ -64,7 +64,7 @@ public class GcubeDefaultMinIoStorageBackendFactory implements StorageBackendFac
return new Metadata(params);
} catch (IOException ex) {
throw new RuntimeException("error initializing MinIO", ex);
throw new RuntimeException("error initializing S3", ex);
}

6
src/main/java/org/gcube/data/access/storagehub/storage/backend/impl/GcubeMinIOStorageBackendFactory.java
View File

@ -19,7 +19,7 @@ import org.gcube.common.storagehub.model.storages.StorageBackendFactory;
@Singleton
public class GcubeMinIOStorageBackendFactory implements StorageBackendFactory {
private static final String PROP_PREFIX = "gcube-minio.";
private static final String PROP_PREFIX = "default.";
private Metadata baseParameters;
@ -30,7 +30,7 @@ public class GcubeMinIOStorageBackendFactory implements StorageBackendFactory {
@Override
public String getName() {
return "gcube-minio";
return "gcube-default-minio";
}
@Override
@ -52,7 +52,7 @@ public class GcubeMinIOStorageBackendFactory implements StorageBackendFactory {
}
private Metadata getParameters(){
try (InputStream input = GcubeDefaultMinIoStorageBackendFactory.class.getClassLoader().getResourceAsStream("storage-settings.properties")) {
try (InputStream input = GcubeMinIOStorageBackendFactory.class.getClassLoader().getResourceAsStream("storage-settings.properties")) {
Properties prop = new Properties();

17
src/main/resources/storage-settings.properties
View File

@ -1,14 +1,9 @@
default.bucketName=storagehub-dev
default.key=68c40352df6e418cbe7ea331d5a95c5b
default.secret=N-wuiTlRv9uJjoa86faJIMgK_dzpc1wccD_pRiwG6--M0xkrat_t-Lmg0DW5MYefOvHfkE8bep_6V9HpOF7HRQ
default.url=https://isti-cloud.isti.cnr.it:13808/swift/v1/AUTH_e8f8ca72f30648a8b389b4e745ac83a9/
default.key=18eb719ebffb4cd0ab78f9343f8aedd2
default.secret=e7b6178dd61d4e0dbbc37ff7cb941aed
default.url=https://isti-cloud.isti.cnr.it:13808/
default.createBucket=false
volatile.bucketName=shub-volatile-dev
volatile.key=68c40352df6e418cbe7ea331d5a95c5b
volatile.secret=N-wuiTlRv9uJjoa86faJIMgK_dzpc1wccD_pRiwG6--M0xkrat_t-Lmg0DW5MYefOvHfkE8bep_6V9HpOF7HRQ
volatile.url=https://isti-cloud.isti.cnr.it:13808/swift/v1/AUTH_e8f8ca72f30648a8b389b4e745ac83a9/
volatile.createBucket=false
gcube-minio.key=qa4zD0QqmcG0JZNG
gcube-minio.secret=9jzHtOigmrprBYtPGIkh3Tq1Bago4zxL
gcube-minio.url=https://minio.d4science.org/
gcube-minio.createBucket=true
volatile.key=18eb719ebffb4cd0ab78f9343f8aedd2
volatile.secret=e7b6178dd61d4e0dbbc37ff7cb941aed
volatile.url=https://isti-cloud.isti.cnr.it:13808/