From 3b0d99cc52f7177f5a4f1521c6212605969f5768 Mon Sep 17 00:00:00 2001 From: Alessandro Pieve Date: Wed, 25 Jan 2017 11:52:34 +0000 Subject: [PATCH] Restore bucket storage status git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-publishing/document-store-lib-couchbase@141761 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../persistence/PersistenceCouchBase.java | 33 ++++++++----------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/gcube/documentstore/persistence/PersistenceCouchBase.java b/src/main/java/org/gcube/documentstore/persistence/PersistenceCouchBase.java index 2d3983b..2618bac 100644 --- a/src/main/java/org/gcube/documentstore/persistence/PersistenceCouchBase.java +++ b/src/main/java/org/gcube/documentstore/persistence/PersistenceCouchBase.java @@ -44,8 +44,8 @@ public class PersistenceCouchBase extends PersistenceBackend { public static final String BUCKET_STORAGE_NAME_PROPERTY_KEY="AggregatedStorageUsageRecord"; public static final String BUCKET_STORAGE_TYPE="StorageUsageRecord"; - //public static final String BUCKET_STORAGE_STATUS_NAME_PROPERTY_KEY="AggregatedStorageStatusRecord"; - //public static final String BUCKET_STORAGE_STATUS_TYPE="StorageStatusRecord"; + public static final String BUCKET_STORAGE_STATUS_NAME_PROPERTY_KEY="AggregatedStorageStatusRecord"; + public static final String BUCKET_STORAGE_STATUS_TYPE="StorageStatusRecord"; public static final String BUCKET_SERVICE_NAME_PROPERTY_KEY="AggregatedServiceUsageRecord"; public static final String BUCKET_SERVICE_TYPE="ServiceUsageRecord"; @@ -89,7 +89,7 @@ public class PersistenceCouchBase extends PersistenceBackend { bucketNames = new HashMap<>(); bucketNames.put(BUCKET_STORAGE_TYPE, configuration.getProperty(BUCKET_STORAGE_NAME_PROPERTY_KEY)); - //bucketNames.put(BUCKET_STORAGE_STATUS_TYPE, configuration.getProperty(BUCKET_STORAGE_STATUS_NAME_PROPERTY_KEY)); + bucketNames.put(BUCKET_STORAGE_STATUS_TYPE, configuration.getProperty(BUCKET_STORAGE_STATUS_NAME_PROPERTY_KEY)); bucketNames.put(BUCKET_SERVICE_TYPE, configuration.getProperty(BUCKET_SERVICE_NAME_PROPERTY_KEY)); bucketNames.put(BUCKET_JOB_TYPE, configuration.getProperty(BUCKET_JOB_NAME_PROPERTY_KEY)); bucketNames.put(BUCKET_PORTLET_TYPE, configuration.getProperty(BUCKET_PORTLET_NAME_PROPERTY_KEY)); @@ -172,10 +172,17 @@ public class PersistenceCouchBase extends PersistenceBackend { String recordType=record.getRecordType(); createItem(jsonObject, record.getId(),recordType); } - + + /** + * {@inheritDoc} + */ @Override - protected void disconnect() throws Exception { - + public void close() throws Exception { + logger.debug("PersistenceCouchBase close" ); + + } + @Override + protected void closeAndClean() throws Exception { synchronized (Connections.connectionsMap) { for (Map.Entry entry : Connections.connectionsMap.get(nodes).getBucketsMap().entrySet()) { @@ -189,23 +196,11 @@ public class PersistenceCouchBase extends PersistenceBackend { logger.warn("cluster not disconnect"); } Connections.connectionsMap.remove(nodes); - logger.trace("PersistenceCouchBase disconnect" ); - - - } }; - /** - * {@inheritDoc} - */ - @Override - public void close() throws Exception { - logger.debug("PersistenceCouchBase close" ); - //Boolean closed =connections.connectionsMap.get(nodes).getCluster().disconnect(); - //cluster.disconnect(); - } +