gCubeSystem
/
storage-manager-trigger
16
0
Fork 0
Code Issues Releases Wiki Activity

new operation SOFT_COPY managed 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/content-management/storage-manager-trigger@169351 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
roberto.cirillo 2018-06-20 14:46:42 +00:00
parent d6a9a82c91
commit 5e90923655
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/gcube/contentmanager/storageserver/accounting/ReportAccountingImpl.java
View File

@ -133,6 +133,8 @@ import org.slf4j.LoggerFactory;
return StorageUsageRecord.OperationType.UPDATE; return StorageUsageRecord.OperationType.UPDATE;
case "COPY": case "COPY":
return StorageUsageRecord.OperationType.CREATE; return StorageUsageRecord.OperationType.CREATE;
case "SOFT_COPY":
return StorageUsageRecord.OperationType.CREATE;
case "MOVE_DIR": case "MOVE_DIR":
return StorageUsageRecord.OperationType.UPDATE; return StorageUsageRecord.OperationType.UPDATE;
case "COPY_DIR": case "COPY_DIR":

6
src/main/java/org/gcube/contentmanager/storageserver/consumer/FolderAccountingConsumer.java
View File

@ -118,7 +118,7 @@ public class FolderAccountingConsumer extends Thread{
if(isNeedFSReport(lastOperation)){ if(isNeedFSReport(lastOperation)){
try{ try{
mongo=new MongoDB(server, user, password); mongo=new MongoDB(server, user, password);
if(lastOperation.equalsIgnoreCase("COPY")) if(lastOperation.equalsIgnoreCase("COPY") || lastOperation.equalsIgnoreCase("SOFT_COPY"))
owner=lastUser; owner=lastUser;
//extract folder from filename field //extract folder from filename field
String folder=filename.substring(0, filename.lastIndexOf("/")); String folder=filename.substring(0, filename.lastIndexOf("/"));
@ -160,7 +160,7 @@ public class FolderAccountingConsumer extends Thread{
private boolean isNeedSSReport(String lastOperation) { private boolean isNeedSSReport(String lastOperation) {
if(lastOperation.equalsIgnoreCase("UPLOAD") || lastOperation.equalsIgnoreCase("COPY") || lastOperation.equalsIgnoreCase("DELETE")) if(lastOperation.equalsIgnoreCase("UPLOAD") || lastOperation.equalsIgnoreCase("COPY") || lastOperation.equalsIgnoreCase("SOFT_COPY") || lastOperation.equalsIgnoreCase("DELETE"))
return true; return true;
return false; return false;
} }
@ -240,7 +240,7 @@ public class FolderAccountingConsumer extends Thread{
* @return * @return
*/ */
private boolean isNeedFSReport(String lastOperation) { private boolean isNeedFSReport(String lastOperation) {
if(lastOperation.equalsIgnoreCase("UPLOAD") || lastOperation.equalsIgnoreCase("COPY") || lastOperation.equalsIgnoreCase("DELETE") || lastOperation.equalsIgnoreCase("MOVE")) if(lastOperation.equalsIgnoreCase("UPLOAD") || lastOperation.equalsIgnoreCase("COPY") || lastOperation.equalsIgnoreCase("SOFT_COPY") || lastOperation.equalsIgnoreCase("DELETE") || lastOperation.equalsIgnoreCase("MOVE"))
return true; return true;
return false; return false;
} }

4
src/main/java/org/gcube/contentmanager/storageserver/consumer/UserAccountingConsumer.java
View File

@ -137,7 +137,7 @@ public class UserAccountingConsumer extends Thread{
logger.debug("[recordCheck] update SS record yet"); logger.debug("[recordCheck] update SS record yet");
if (mongo== null) if (mongo== null)
mongo=new MongoDB(server, user, password); mongo=new MongoDB(server, user, password);
if(record.getLastOperation().equalsIgnoreCase("COPY")) if(record.getLastOperation().equalsIgnoreCase("COPY") || record.getLastOperation().equalsIgnoreCase("SOFT_COPY"))
record.setOwner(record.getLastUser()); record.setOwner(record.getLastUser());
ssr=new StorageStatusObject(record.getOwner(), record.getLength(), 1); ssr=new StorageStatusObject(record.getOwner(), record.getLength(), 1);
ssr=mongo.updateUserVolume(ssr, record.getLastOperation()); ssr=mongo.updateUserVolume(ssr, record.getLastOperation());
@ -183,7 +183,7 @@ public class UserAccountingConsumer extends Thread{
*/ */
private boolean isNeedSSReport(String lastOperation) { private boolean isNeedSSReport(String lastOperation) {
logger.trace("Last operation is "+lastOperation); logger.trace("Last operation is "+lastOperation);
if(lastOperation.equalsIgnoreCase("UPLOAD") || lastOperation.equalsIgnoreCase("COPY") || lastOperation.equalsIgnoreCase("DELETE")) if(lastOperation.equalsIgnoreCase("UPLOAD") || lastOperation.equalsIgnoreCase("COPY") || lastOperation.equalsIgnoreCase("SOFT_COPY")|| lastOperation.equalsIgnoreCase("DELETE"))
return true; return true;
return false; return false;
} }

4
src/main/java/org/gcube/contentmanager/storageserver/store/FolderStatusOperationManager.java
View File

@ -109,7 +109,7 @@ public class FolderStatusOperationManager {
private long volumeCalculation(long currentVolume, long partialVolume, String operation) { private long volumeCalculation(long currentVolume, long partialVolume, String operation) {
logger.debug("folder accounting: operation "+operation+" total Volume "+partialVolume+" current volume "+currentVolume); logger.debug("folder accounting: operation "+operation+" total Volume "+partialVolume+" current volume "+currentVolume);
if(operation.equalsIgnoreCase("UPLOAD") || operation.equalsIgnoreCase("COPY")){ if(operation.equalsIgnoreCase("UPLOAD") || operation.equalsIgnoreCase("COPY") || operation.equalsIgnoreCase("SOFT_COPY")){
partialVolume=partialVolume+currentVolume; partialVolume=partialVolume+currentVolume;
}else if(operation.equalsIgnoreCase("DELETE")){ }else if(operation.equalsIgnoreCase("DELETE")){
partialVolume=partialVolume-currentVolume; partialVolume=partialVolume-currentVolume;
@ -120,7 +120,7 @@ public class FolderStatusOperationManager {
private int countCalculation(int currentCount, int partialCount, String operation) { private int countCalculation(int currentCount, int partialCount, String operation) {
logger.debug("folder accounting operation "+operation+" partial count "+partialCount+" current count"+currentCount); logger.debug("folder accounting operation "+operation+" partial count "+partialCount+" current count"+currentCount);
if(operation.equalsIgnoreCase("UPLOAD")|| operation.equalsIgnoreCase("COPY")) if(operation.equalsIgnoreCase("UPLOAD")|| operation.equalsIgnoreCase("COPY") || operation.equalsIgnoreCase("SOFT_COPY"))
partialCount=partialCount+currentCount; partialCount=partialCount+currentCount;
else if(operation.equalsIgnoreCase("DELETE")) else if(operation.equalsIgnoreCase("DELETE"))
partialCount=partialCount-currentCount; partialCount=partialCount-currentCount;

4
src/main/java/org/gcube/contentmanager/storageserver/store/StorageStatusOperationManager.java
View File

@ -95,7 +95,7 @@ public class StorageStatusOperationManager {
private long volumeCalculation(long currentVolume, long partialVolume, String operation) { private long volumeCalculation(long currentVolume, long partialVolume, String operation) {
logger.info("accounting: operation "+operation+" total Volume "+partialVolume+" current volume "+currentVolume); logger.info("accounting: operation "+operation+" total Volume "+partialVolume+" current volume "+currentVolume);
if(operation.equalsIgnoreCase("UPLOAD") || operation.equalsIgnoreCase("COPY")){ if(operation.equalsIgnoreCase("UPLOAD") || operation.equalsIgnoreCase("COPY") || operation.equalsIgnoreCase("SOFT_COPY")){
partialVolume=partialVolume+currentVolume; partialVolume=partialVolume+currentVolume;
}else if(operation.equalsIgnoreCase("DELETE")){ }else if(operation.equalsIgnoreCase("DELETE")){
partialVolume=partialVolume-currentVolume; partialVolume=partialVolume-currentVolume;
@ -108,7 +108,7 @@ public class StorageStatusOperationManager {
// int partial=Integer.parseInt(partialCount); // int partial=Integer.parseInt(partialCount);
// int current=Integer.parseInt(currentCount); // int current=Integer.parseInt(currentCount);
logger.info("accounting: operation "+operation+" old count "+partial+" current count"+current); logger.info("accounting: operation "+operation+" old count "+partial+" current count"+current);
if(operation.equalsIgnoreCase("UPLOAD")|| operation.equalsIgnoreCase("COPY")) if(operation.equalsIgnoreCase("UPLOAD")|| operation.equalsIgnoreCase("COPY") || operation.equalsIgnoreCase("SOFT_COPY"))
partial=partial+current; partial=partial+current;
else if(operation.equalsIgnoreCase("DELETE")) else if(operation.equalsIgnoreCase("DELETE"))
partial=partial-current; partial=partial-current;