/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 8585

Added by ben leinfelder almost 11 years ago

Couple modifications:
-use "pid" throughout so as not to confuse docids and pids
-ensure any failures in the set do not prevent synching for other pids in the set

     import java.util.Date;
     import java.util.HashMap;
     import java.util.HashSet;
     import java.util.Iterator;
     import java.util.List;
     import java.util.Map;
     import java.util.Set;
-...
     import edu.ucsb.nceas.metacat.IdentifierManager;
     import edu.ucsb.nceas.metacat.McdbDocNotFoundException;
     import edu.ucsb.nceas.metacat.accesscontrol.AccessControlException;
     import edu.ucsb.nceas.metacat.dataone.D1NodeService;
     import edu.ucsb.nceas.metacat.properties.PropertyService;
     import edu.ucsb.nceas.metacat.shared.ServiceException;
     import edu.ucsb.nceas.utilities.PropertyNotFoundException;
-...
     	private static Logger logMetacat = Logger.getLogger(SyncAccessPolicy.class);
     	protected static int MAXIMUM_DB_RECORD_COUNT;
     	static {
     		try {
     			MAXIMUM_DB_RECORD_COUNT = Integer.valueOf(PropertyService
     					.getProperty("database.webResultsetSize"));
     		} catch (Exception e) {
     			logMetacat.warn("Could not set MAXIMUM_DB_RECORD_COUNT", e);
+    		}
+    	}
     	/**
     	 * Synchronize access policy (from system metadata) of d1 member node with
     	 * the corresponding controlling node.
-...
     	 * @throws AccessionNumberException
     	 * @throws NumberFormatException
     	 */
     	public List<Identifier> sync(ObjectList objList) throws ServiceFailure,
     	private List<Identifier> sync(ObjectList objList) throws ServiceFailure,
     			InvalidToken, NotAuthorized, NotFound, NotImplemented,
     			McdbDocNotFoundException, InvalidRequest, VersionMismatch,
     			NumberFormatException, AccessionNumberException, SQLException, Exception {
     		AccessPolicy cnAccessPolicy = null;
     		String guid = null;
     		AccessPolicy mnAccessPolicy = null;
     		Identifier pid = new Identifier();
     		ObjectInfo objInfo = null;
-...
     			objInfo = objList.getObjectInfo(i);
     			pid = objInfo.getIdentifier();
     			logMetacat.debug("Getting SM for pid: " + pid.getValue() + " i: "
     					+ i);
     			logMetacat.debug("Getting SM for pid: " + pid.getValue() + " i: " + i);
     			try {
     				// Get sm, access policy for requested localId
     				mnSysMeta = IdentifierManager.getInstance().getSystemMetadata(
-...
     			} catch (McdbDocNotFoundException e) {
     				logMetacat.error("Error syncing access policy of pid: "
     						+ pid.getValue() + " pid not found: " + e.getMessage());
     				continue;
     			} catch (Exception e) {
     				logMetacat.error("Error syncing access policy of pid: "
     						+ pid.getValue() + e.getMessage());
     						+ pid.getValue() + ". Message: " + e.getMessage());
     				continue;
+    			}
     			logMetacat
     					.debug("Getting access policy for pid: " + pid.getValue());
     			logMetacat.debug("Getting access policy for pid: " + pid.getValue());
     			mnAccessPolicy = mnSysMeta.getAccessPolicy();
-...
     									+ pid.getValue()
     									+ " user not authorized: "
     									+ na.getMessage());
     					throw na;
     					//throw na;
     					continue;
     				} catch (ServiceFailure sf) {
     					logMetacat
     							.error("Error syncing CN with access policy of pid: "
     									+ pid.getValue()
     									+ " Service failure: "
     									+ sf.getMessage());
     					throw sf;
     					//throw sf;
     					continue;
     				} catch (Exception e) {
     					logMetacat
     							.error("Error syncing CN with access policy of pid: "
     									+ pid.getValue() + e.getMessage());
     					throw e;
     					//throw e;
     					continue;
+    				}
     			} else {
     				logMetacat.warn("Skipping pid: " + pid.getValue());
+    			}
     			logMetacat.debug("Done syncing access policy for pid: " + pid.getValue());
+    		}
-...
     		SystemMetadata sm = new SystemMetadata();
     		int start = 0;
     		int count = guidsToSync.size();
     		int total = count;
     		int count = 0; //guidsToSync.size();
     		objList.setStart(start);
     		objList.setCount(count);
     		objList.setTotal(total);
     		// Convert the guids to d1 objects, as this is what
     		// IdentifierManager.getInstance().querySystemMetadata returns in
-...
     		for (String guid : guidsToSync) {
     			try {
     				sm = IdentifierManager.getInstance().getSystemMetadata(guid);
     				count++;
     			} catch (Exception e) {
     				logMetacat.error("Error syncing access policy of pid: " + guid
     						+ e.getMessage());
     						+ ". Message: " + e.getMessage());
     				continue;
+    			}
     			ObjectInfo oi = new ObjectInfo();
-...
     			oi.setSize(sm.getSize());
     			objList.addObjectInfo(oi);
+    		}
     		int total = count;
     		objList.setCount(count);
     		objList.setTotal(total);
     		syncedPids = sync(objList);
     		return syncedPids;
-...
     		Boolean replicaStatus = false; // return only pids for which this mn is
     										// authoritative
     		Integer start = 0;
     		Integer count = MAXIMUM_DB_RECORD_COUNT;
     		Integer count = Integer.valueOf(PropertyService.getProperty("database.webResultsetSize"));
     		ObjectList objsToSync = IdentifierManager.getInstance()
     				.querySystemMetadata(startTime, endTime, objectFormatId,
-...
     			Subject s1 = entry.getKey();
     			// Perms that the user holds
     			Set<Permission> p1 = entry.getValue();
     			logMetacat
     					.debug("Checking access policy of user: " + s1.getValue());
     			logMetacat.debug("Checking access policy of user: " + s1.getValue());
     			// Does this user exist in both access policies?
     			if (userPerms2.containsKey(s1)) {
-...
     		return true;
+    	}
     	/**
     	 * Run pid synch script on the given pids
     	 * Each argument is an individual pid
     	 * because pids cannot contain whitespace.
     	 * @param args
     	 * @throws Exception
     	 */
     	public static void main(String[] args) throws Exception {
     		ArrayList<String> guids = null;
     		SyncAccessPolicy syncAP = new SyncAccessPolicy();
     		// set up the properties based on the test/deployed configuration of the
     		// workspace
     		SortedProperties testProperties = new SortedProperties(
     				"test/test.properties");
     		SortedProperties testProperties = new SortedProperties("test/test.properties");
     		testProperties.load();
     		String metacatContextDir = testProperties
     				.getProperty("metacat.contextDir");
     		String metacatContextDir = testProperties.getProperty("metacat.contextDir");
     		PropertyService.getInstance(metacatContextDir + "/WEB-INF");
     		ArrayList<String> guids = null;
     		SyncAccessPolicy syncAP = new SyncAccessPolicy();
     		if (args.length > 0) {
     			try {
     				guids = new ArrayList<String>(Arrays.asList(args[0]
     						.split("\\s*,\\s*")));
     				logMetacat.debug("Trying to syncing access policy for pids: "
     						+ args[0]);
     				syncAP.sync(guids);
     				guids = new ArrayList<String>(Arrays.asList(args));
     				logMetacat.warn("Trying to syncing access policy for " + args.length + " pids");
     				List<Identifier> synchedPids = syncAP.sync(guids);
     				logMetacat.warn("Sunk access policies for " + synchedPids.size() + " pids");
     			} catch (Exception e) {
     				System.err.println("Error syncing pids: " + args[0]
     						+ " Exception " + e.getMessage());
     				logMetacat.error("Error syncing pids, message: " + e.getMessage(), e);
     				System.exit(1);
+    			}
+    		}

     				SyncAccessPolicy syncAP = new SyncAccessPolicy();
     				response.setContentType("text/html");
     				out = response.getWriter();
     				if (params.containsKey("docids")) {
     					String docIds = ((String[]) params.get("docids"))[0];
     					logMetacat.debug("Attempting to sync access policies for docids: " + docIds);
     					ArrayList<String> ids = new ArrayList<String>(
     							Arrays.asList(docIds.split("\\s*,\\s*")));
     				if (params.containsKey("pid")) {
     					String[] pids = params.get("pid");
     					logMetacat.debug("Attempting to sync access policies for pids: " + pids);
     					ArrayList<String> pidsToSync = new ArrayList<String>(Arrays.asList(pids));
     					try {
     						List<Identifier> syncedIds = syncAP.sync(ids);
     						out.write("<html><body>Syncing access policies has completed.</body></html>");
     						List<Identifier> syncedPids = syncAP.sync(pidsToSync);
     						out.write("<html><body>Syncing access policies has completed for " + syncedPids.size() + " pids.</body></html>");
     					} catch (Exception e) {
     						logMetacat.error("Error syncing all access polies: "
     								+ e.getMessage());

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 8585

Added by ben leinfelder almost 11 years ago