git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-publishing/document-store-lib-couchbase@141724 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
6d41713016
commit
8a974b99fd
|
@ -27,6 +27,7 @@ import com.couchbase.client.java.env.DefaultCouchbaseEnvironment;
|
|||
|
||||
/**
|
||||
* @author Luca Frosini (ISTI - CNR)
|
||||
* @author Alessandro Pieve (ISTI - CNR) alessandro.pieve@isti.cnr.it
|
||||
*/
|
||||
public class PersistenceCouchBase extends PersistenceBackend {
|
||||
|
||||
|
@ -43,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";
|
||||
|
@ -88,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));
|
||||
|
@ -101,12 +102,12 @@ public class PersistenceCouchBase extends PersistenceBackend {
|
|||
synchronized (Connections.connectionsMap) {
|
||||
if (!Connections.connectionsMap.containsKey(nodes)){
|
||||
//open cluster and add into map
|
||||
logger.debug("PersistenceCouchBase openConnection bucketNames :{}",bucketNames);
|
||||
//logger.trace("PersistenceCouchBase openConnection bucketNames :{}",bucketNames);
|
||||
Cluster cluster = null;
|
||||
try {
|
||||
cluster = CouchbaseCluster.create(ENV, nodes.getNodes());
|
||||
Connections.connectionsMap.put(nodes, new Connection(cluster));
|
||||
logger.debug("PersistenceCouchBase openConnection insert nodes:{}",Connections.connectionsMap );
|
||||
logger.trace("PersistenceCouchBase openConnection insert nodes:{}",Connections.connectionsMap );
|
||||
} catch(Exception e) {
|
||||
cluster.disconnect();
|
||||
logger.error("Bucket connection error", e);
|
||||
|
@ -114,7 +115,7 @@ public class PersistenceCouchBase extends PersistenceBackend {
|
|||
}
|
||||
}
|
||||
else{
|
||||
logger.debug("PersistenceCouchBase openConnection contains node use an existing cluster env");
|
||||
//logger.debug("PersistenceCouchBase openConnection contains node use an existing cluster env");
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -125,14 +126,14 @@ public class PersistenceCouchBase extends PersistenceBackend {
|
|||
Bucket bucket = null;
|
||||
synchronized (Connections.connectionsMap) {
|
||||
bucket =Connections.connectionsMap.get(nodes).getBucketsMap().get(bucketNames.get(recordType));
|
||||
logger.debug("PersistenceCouchBase getBucketConnection recordType:{}, bucket name:{}",recordType,bucketNames.get(recordType));
|
||||
//logger.debug("PersistenceCouchBase getBucketConnection recordType:{}, bucket name:{}",recordType,bucketNames.get(recordType));
|
||||
if(bucket == null){
|
||||
//bucket = cluster.openBucket(recordType, password);
|
||||
bucket = Connections.connectionsMap.get(nodes).getCluster().openBucket(bucketNames.get(recordType), password);
|
||||
logger.debug("PersistenceCouchBase getBucketConnection bucket close, open:{}",bucket.toString() );
|
||||
logger.trace("PersistenceCouchBase getBucketConnection bucket close, open:{}",bucket.toString() );
|
||||
//connectionMap.put(recordType, bucket);
|
||||
Connections.connectionsMap.get(nodes).getBucketsMap().put(bucketNames.get(recordType), bucket);
|
||||
logger.debug("PersistenceCouchBase getBucketConnection connectionMap:{}",Connections.connectionsMap.get(nodes).getBucketsMap());
|
||||
logger.trace("PersistenceCouchBase getBucketConnection connectionMap:{}",Connections.connectionsMap.get(nodes).getBucketsMap());
|
||||
}
|
||||
}
|
||||
return bucket;
|
||||
|
@ -189,7 +190,7 @@ public class PersistenceCouchBase extends PersistenceBackend {
|
|||
}
|
||||
Connections.connectionsMap.remove(nodes);
|
||||
|
||||
logger.debug("PersistenceCouchBase disconnect" );
|
||||
logger.trace("PersistenceCouchBase disconnect" );
|
||||
|
||||
|
||||
|
||||
|
|
Reference in New Issue