Permalink
Browse files

Added License (so people are forced now to attribution)

  • Loading branch information...
1 parent ac8f6c5 commit d4127ff690a290b583479ff29de431e8f2083368 @drelu drelu committed Jul 29, 2012
Showing with 36 additions and 11 deletions.
  1. +21 −0 LICENSE.md
  2. +2 −10 examples/pilot-api/example-pilot-compute-data.py
  3. +12 −0 pilot/impl/pilotdata_manager.py
  4. +1 −1 setup.py
View
21 LICENSE.md
@@ -0,0 +1,21 @@
+BigJob is licensed under the MIT License (MIT)
+---------------------------------------------
+
+Copyright (C) 2008-2012 by Andre Luckow and the SAGA Project (saga-project.org)
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
View
12 examples/pilot-api/example-pilot-compute-data.py
@@ -71,19 +71,11 @@
"affinity_datacenter_label": "eu-de-south",
"affinity_machine_label": "mymachine-1"
}
+
compute_unit = compute_data_service.submit_compute_unit(compute_unit_description)
logging.debug("Finished setup of PSS and PDS. Waiting for scheduling of PD")
compute_data_service.wait()
- #while data_unit.get_state() != State.Done and compute_unit != State.Done:
- # logging.debug("Check state")
- # state_data_unit = data_unit.get_state()
- # state_compute_unit = compute_unit.get_state()
- # print "PJS State %s" % pilot_compute_service
- # print "DU: %s State: %s"%(data_unit, state_data_unit)
- # print "CU: %s State: %s"%(compute_unit, state_compute_unit)
- # if state_compute_unit==State.Done and state_data_unit==State.Running:
- # break
- # time.sleep(2)
+
logging.debug("Terminate Pilot Compute/Data Service")
compute_data_service.cancel()
View
12 pilot/impl/pilotdata_manager.py
@@ -25,6 +25,11 @@
from pilot.filemanagement.globusonline_adaptor import GlobusOnlineFileAdaptor
except:
logger.warn("Globus Online package not found.")
+
+try:
+ from pilot.filemanagement.gs_adaptor import GSFileAdaptor
+except:
+ logger.warn("Globus Online package not found.")
#from pilot.coordination.advert import AdvertCoordinationAdaptor as CoordinationAdaptor
@@ -59,6 +64,7 @@ def __init__(self, pilot_data_service=None, pilot_data_description=None, pd_url=
ssh://<hostname>
gsissh://<hostname>
go://<hostname>
+ gs://google.com
In the future more SAGA/Bliss URL schemes/adaptors are supported.
"""
@@ -97,6 +103,12 @@ def __initialize_pilot_data(self):
elif self.service_url.startswith("http:"):
logger.debug("Use WebHDFS backend")
self.__filemanager = WebHDFSFileAdaptor(self.service_url)
+ elif self.service_url.startswith("go:"):
+ logger.debug("Use Globus Online backend")
+ self.__filemanager = GSFileAdaptor(self.service_url)
+ elif self.service_url.startswith("gs:"):
+ logger.debug("Use Google Cloud Storage backend")
+ self.__filemanager = GSFileAdaptor(self.service_url)
self.__filemanager.initialize_pilotdata()
self.__filemanager.get_pilotdata_size()
View
2 setup.py
@@ -39,7 +39,7 @@
# data files for pip
package_data = {'': ['*.conf']},
- install_requires=['paramiko-on-pypi', 'uuid', 'threadpool', 'virtualenv', 'redis==2.2.4', 'bliss'],
+ install_requires=['paramiko-on-pypi', 'uuid', 'threadpool', 'virtualenv', 'redis==2.2.4', 'bliss', 'google-api-python-client'],
entry_points = {
'console_scripts': [
'test-bigjob = examples.example_local_single:main',

0 comments on commit d4127ff

Please sign in to comment.