/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 7147

call MN.delete() for each replica when CN.delete() is called
https://redmine.dataone.org/issues/2676

+    	  }
     	  // defer to superclass implementation
           return super.delete(session, pid);
     	  Identifier retId =  super.delete(session, pid);
     	  // notify the replicas
     	  SystemMetadata systemMetadata = HazelcastService.getInstance().getSystemMetadataMap().get(pid);
     	  if (systemMetadata.getReplicaList() != null) {
     		  for (Replica replica: systemMetadata.getReplicaList()) {
     			  NodeReference replicaNode = replica.getReplicaMemberNode();
     			  try {
     				  Identifier mnRetId = D1Client.getMN(replicaNode).delete(null, pid);
     			  } catch (Exception e) {
     				  // all we can really do is log errors and carry on with life
     				  logMetacat.error("Error deleting pid: " +  pid.getValue() + " from replica MN: " + replicaNode.getValue(), e);
+    			}
+    		  }
+    	  }
     	  return retId;
+      }
       /**

           if (allowed) {
               try {
                   // delete the document
             	  //  TODO: the method - or one like it - actually needs to remove content not just archive it
                   DocumentImpl.delete(localId, username, groupnames, null);
                   EventLog.getInstance().log(request.getRemoteAddr(), request.getHeader("User-Agent"), username, localId, Event.DELETE.xmlValue());
-...
                   sysMeta.setArchived(true);
                   HazelcastService.getInstance().getSystemMetadataMap().put(pid, sysMeta);
                   // remove the system metadata for it
                   //HazelcastService.getInstance().getSystemMetadataMap().remove(pid);
               } catch (McdbDocNotFoundException e) {
                   throw new NotFound("1340", "The provided identifier was invalid.");

Also available in: Unified diff