Removing arbitrary 5 second wait on server.

Author: LucaCinquini

INSTALL.txt

@@ -103,8 +103,8 @@ o Trigger metadata update for previously uploaded dataset "mydata":
 ./wmgr-client --url http://localhost:9001 --operation --sendEvent --eventName labcas-update --metaData --key Dataset mydata
 
 Each metadata field contained in the file "DatasetMetadata.xml" will be updated, completely replacing all previous values for that field.
-To insert multiple values for the same field, simply specify multiple "<keyval>" elements. To completely remove all values for a field, 
-leave the "<val>" empty.
+To insert multiple values for the same field, simply specify multiple "<val>" elements within a "<keyval>" element. 
+To completely remove all values for a field, leave the "<val>" empty.
 
 Example of DatasetMetadata.xml:
 
@@ -117,9 +117,6 @@ Example of DatasetMetadata.xml:
 	<keyval type="vector">
 		<key>Institution</key>
 		<val>Darthmouth</val>
-	</keyval>
-	<keyval type="vector">
-		<key>Institution</key>
 		<val>Children Hospital</val>
 	</keyval>
 </cas:metadata>

common/src/main/java/gov/nasa/jpl/edrn/labcas/utils/FileManagerUtils.java

@@ -206,12 +206,22 @@ public static void reload() throws Exception {
 
 		XmlRpcFileManagerClient client = new XmlRpcFileManagerClient(new URL(FILEMANAGER_URL));
 
+		LOG.info("Reloading the File Manager...");
 		boolean status = client.refreshConfigAndPolicy();
 
-		// FIXME: sleep 5 seconds
-		Thread.sleep(5000); 
+		// wait for the File Manager to come back online
+		boolean isAlive = false;
+		while (!isAlive) {
+			try {
+				isAlive = client.isAlive();	
+			} catch(Exception e) {
+				LOG.warning(e.getMessage());
+				LOG.info("Waiting for File Manager to reload...");
+				Thread.sleep(1000); // wait 1 second
+			}
+		}
 
-		LOG.info("File Manager reoloaded, status="+status);
+		LOG.info("File Manager reoloaded - status="+status);
 
 	}
 
@@ -475,19 +485,21 @@ public static final void makeProductTypesXmlFile(File filepath, String productTy
         Element metadataElement = xmlDocument.createElement("metadata");
         typeElement.appendChild(metadataElement);
 
-        // loop over all metadata keys, values
+        // loop over all metadata keys
         for (String key : metadata.getAllKeys()) {
+
+        	// <keyval>
+        	Element keyvalElement = xmlDocument.createElement("keyval");
+        	metadataElement.appendChild(keyvalElement);
+        	
+        	// <key>Dataset</key>
+        	Element keyElement = xmlDocument.createElement("key");
+        	keyElement.insertBefore(xmlDocument.createTextNode(key), keyElement.getLastChild());
+        	keyvalElement.appendChild(keyElement);
+        	
+        	// loop over all values for that key
         	for (String val : metadata.getAllMetadata(key)) {
 
-	        	// <keyval>
-	        	Element keyvalElement = xmlDocument.createElement("keyval");
-	        	metadataElement.appendChild(keyvalElement);
-	        	
-	        	// <key>Dataset</key>
-	        	Element keyElement = xmlDocument.createElement("key");
-	        	keyElement.insertBefore(xmlDocument.createTextNode(key), keyElement.getLastChild());
-	        	keyvalElement.appendChild(keyElement);
-	        	
 	        	// <val>[Dataset]</val>
 	        	Element valElement = xmlDocument.createElement("val");
 	        	valElement.insertBefore(xmlDocument.createTextNode(val), valElement.getLastChild());

examples/labcas-xmlrpc-example-filemgr-client.py

@@ -1,22 +1,12 @@
 #!/usr/bin/python
-# Example Python script for interacting with an OODT FileManager through its XML/RPC interface
-# Supported server methods are defined in file org.apache.oodt.cas.filemgr.system.XmlRpcFileManager:
-# o public Vector<Hashtable<String, Object>> getProductTypes()
-# o public String addProductType(Hashtable<String, Object> productTypeHash()
+# Example Python script for querying the OODT File Manager through its XML/RPC interface.
 
 import xmlrpclib
-import time
-
-def listProductTypes(server):
-	
-	# list all supported product types
-	print 'Listing product types in File Manager'
-	productTypes =  server.filemgr.getProductTypes()
-	for ptMap in productTypes:
-		print 'PRODUCT TYPE:'
-		for key, value in ptMap.items():
-			print '%s = %s' % (key, value)
 
+def printProductType(productTypeDict):
+	print 'PRODUCT TYPE: %s' % productTypeDict['name']
+	for key, value in productTypeDict.items():
+		print '\t%s = %s' % (key, value)
 
 if __name__ == '__main__':
 
@@ -25,25 +15,8 @@ def listProductTypes(server):
 	verbose=False
 	server = xmlrpclib.ServerProxy('http://localhost:9000/', verbose=verbose)
 
-	listProductTypes(server)
+	print "Server is alive: %s" % server.filemgr.isAlive()
 
-	# add new product type		
-	# will override if existing already
-	'''
-	ptHash = { 'id':"XYZ",
-			  'name': 'XYZ_Product_Type',
-			  'description': 'XYZ product type',
-              'repositoryPath' : 'file:///usr/local/labcas_archive/labcas-upload',
-              'versionerClass':"gov.nasa.jpl.edrn.labcas.versioning.LabcasProductVersioner",
-              "typeExtractors": [{'className': 'org.apache.oodt.cas.filemgr.metadata.extractors.CoreMetExtractor', 
-								  'config': {'elementNs': 'CAS', 'elements': 'ProductReceivedTime,ProductName,ProductId,ProductType', 'nsAware': 'true'}}, 
-								 {'className': 'org.apache.oodt.cas.filemgr.metadata.extractors.examples.MimeTypeExtractor', 
-								  'config': {}}],
-              "typeMetadata": {'Version': ['[Version]'], 'Dataset': ['[Dataset]']} }
-	
-	ptName = server.filemgr.addProductType(ptHash)
-	print 'Added product type: %s' % ptName
-	
-	listProductTypes(server) 
-	'''
-	
+	productTypes =  server.filemgr.getProductTypes()
+	for productTypeDict in productTypes:
+		printProductType(productTypeDict)