Skip to content


Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
Checking mergeability… Don't worry, you can still create the pull request.
This comparison is big! We're only showing the most recent 250 commits
Commits on Aug 02, 2010
@pauloricardomg pauloricardomg -Renamed Spot Instances references (SIRequest, SIManager, etc) to Asy…
…nchronous Requests in order to acomodate backfill requests

-Added support to backfill requests
-Fixed tests
@pauloricardomg pauloricardomg -added RM API support to backfill requests
-renamed SI related classes to Async
@pauloricardomg pauloricardomg fixed and improved tests 939faa6
@pauloricardomg pauloricardomg Merge remote branch 'upstream/master' into spotinstances c5cffa3
Commits on Aug 03, 2010
@pauloricardomg pauloricardomg -Renamed package org.globus.workspace.spotinstances to org.globus.wor…

-Refactored spotinstances.conf
-Few refactoring
@pauloricardomg pauloricardomg fixed tests fb6b84b
@pauloricardomg pauloricardomg Merge remote branch 'upstream/master' into spotinstances b2f96e9
@pauloricardomg pauloricardomg some refactoring 4faef89
Commits on Aug 04, 2010
@pauloricardomg pauloricardomg updated ec2 schema from v2009_08_15 to v2010_06_15 efa8d13
Commits on Aug 05, 2010
@pauloricardomg pauloricardomg changed si.basic.mem property to si.instancetype (small, large, xlarg…
…e) in spotinstances.conf file
@pauloricardomg pauloricardomg minor modifications in RequestInfo and RequestState d37b3b5
@pauloricardomg pauloricardomg added sshkeyName to AsyncRequest a666110
@pauloricardomg pauloricardomg support to EC2 requestSpotInstances a61859c
@pauloricardomg pauloricardomg fixed test suites 02ea4ff
Commits on Aug 07, 2010
@pauloricardomg pauloricardomg Created support class for Cancel Spot Instance Requests operation e7ebf00
@pauloricardomg pauloricardomg Created support class for Describe Spot Instance Requests operation 04357f1
@pauloricardomg pauloricardomg Created support class for Describe Spot Price History operation 06500b3
@pauloricardomg pauloricardomg made getGroupStub() method static 996f3ca
@pauloricardomg pauloricardomg refactored RequestSI class 2bd7363
@pauloricardomg pauloricardomg added EC2 support to describe SI, cancel SI and describe spot price h…
Commits on Aug 08, 2010
@pauloricardomg pauloricardomg updated test suites 2cfee55
@pauloricardomg pauloricardomg renamed method describeSpotPriceHistoryResponseType to describeSpotPr…
@pauloricardomg pauloricardomg Added support to Spot Instance operations on Query Interface 09fd4c7
Commits on Aug 09, 2010
@pauloricardomg pauloricardomg refactoring in ResourceAllocation and DataConvert 24db467
@pauloricardomg pauloricardomg Added instanceLifeCycle and SpotInstanceRequestID attributes to Descr…
…ibeInstances response
@pauloricardomg pauloricardomg Merge remote branch 'upstream/master' into spotinstances cb5e0dc
@pauloricardomg pauloricardomg fixed constructor df1f32e
@pauloricardomg pauloricardomg updated schema version in server config file cbba4f7
@pauloricardomg pauloricardomg fixed typo e9d36c0
@pauloricardomg pauloricardomg added unimplemented operations from ec2 schema v2010-06-15 945fc36
@pauloricardomg pauloricardomg missing unimplemented operation from v2010-06-15 b7303ff
Commits on Aug 10, 2010
@pauloricardomg pauloricardomg fixed SI type bug in DefaultResourceAllocations and improved spotinst…
…ances.conf file
@pauloricardomg pauloricardomg minor bug fix 14fb1a4
@pauloricardomg pauloricardomg fixed MultiValuedMap parameters 5efba92
@pauloricardomg pauloricardomg Not trashing VMs from spot instance request after it is canceled (in …
…order to conform to EC2 spec)
@pauloricardomg pauloricardomg fixed and improved test suite 25ea860
@pauloricardomg pauloricardomg added authorization logging 4c461a8
@pauloricardomg pauloricardomg added equals method to DefaultCaller and fixed log type in Delegating…
Commits on Aug 11, 2010
@pauloricardomg pauloricardomg fixed id mapping bug 9805572
Commits on Aug 12, 2010
@pauloricardomg pauloricardomg minor fix 9fa1bd0
@pauloricardomg pauloricardomg Spot Instances boto test suite for Nimbus 41d6e35
Commits on Aug 14, 2010
@pauloricardomg pauloricardomg AsyncRequestManager is now retrieving previous spot price during init 8c153c0
@pauloricardomg pauloricardomg minor fixes 720c744
@pauloricardomg pauloricardomg fixed bugs 3a6c23c
@pauloricardomg pauloricardomg changed default minimum reserved memory 2309e5e
@pauloricardomg pauloricardomg improved ec2 test suite 892e0e5
@pauloricardomg pauloricardomg fixed minor bug e37e5c2
@pauloricardomg pauloricardomg Moved network binding to after scheduling 60afde5
Commits on Aug 16, 2010
@pauloricardomg pauloricardomg minor correction 1a8f3f8
@pauloricardomg pauloricardomg some javadoc 5e1cb4b
Commits on Nov 08, 2010
@timf timf giving 2.5 docs a pointer to most recent docs dcc7f37
@timf timf do not use term 'deprecated' f417441
Commits on Nov 10, 2010
@timf timf note about GCJ e25dad3
@timf timf notes on local/laptop pilot development 5136340
@timf timf link to contributor's license 5dfd12b
@timf timf html in the screen div... ff53350
@timf timf moving to new scheme for alerting readers they are looking at old rel…
…ease docs
Commits on Nov 11, 2010
@timf timf s/RC1// 6c1a638
@labisso labisso Added note about REST broker port configuration ff3e346
Commits on Nov 12, 2010
@labisso labisso Improved formatting of LT setup docs 1373e4e
@labisso labisso LANTorrent actually requires py2.5+ 8917a3c
Commits on Nov 15, 2010
@timf timf wrong markdown syntax e99652f
@timf timf Initial merge of Paulo Gomes' spotinstances Google Summer of Code con…
…tribution: hard conflicts included in this commit.

@timf timf Exposing NodeManagement in the RMAPI, allows other ways to communicat…
…e to it (in this case it was for test suites to alter the resource pool dynamically
@timf timf DB schema and prepared stmt manual merge bb7ea66
@timf timf most resource pool related changes b45edbf
@timf timf necessary suites.common changes a9d155d
@timf timf necessary suites.basic changes 7c42d6b
@timf timf one suites.spotinstances change is to remove noresources distinction,…
… this will be done programmatically
@timf timf some of the necessary suites.spotinstances changes 5dd69f1
@timf timf Adding calculateMaxVMs() here allows for the late pickup of resources…
… that are not available at init (they used to be known at init before Nimbus 2.6). Note that this only makes the singleRequest() test work, not the others.
@labisso labisso Do our own URL parsing for LT propagation.
Python urlparse comes up short again, especially on Py 2.4
@labisso labisso Added timestamps to LT logs, cleaner logfile names ca3a81a
@labisso labisso Typo in LT tempfile suffix c7e5e14
@labisso labisso Removed unrelated header comments from xinetd tmpl
Also removed old virga inet file
Commits on Nov 16, 2010
@timf timf Added getVMMReport() to Manager API, mainly for inspecting from trick…
…y scheduler tests
@timf timf Support for better test output 9a81ff1
@timf timf Make the warning more visible cd0c797
@timf timf Added 'SYNCHRONIZED ISSUE' note where the locking issue occurs. Exerc…
…ise by right-clicking SimplestSISuite and 'Run' or set breakpoint there and use 'Debug' instead
@timf timf New locking scheme for DefaultSlotManagement. SimplestSISuite now pas…
Commits on Nov 17, 2010
@labisso labisso Proposed workaround for buggy Xen/libvirt VM state
The default Xen/libvirt on RHEL5 occasionally reports VMs as DOM_STATE_NOSTATE. The cause is not clear but anecdotally it seems to be related to multiple VMs running on a node. Previously, ws-control treated these VMs as not found which led to zombie VMs. 

This change causes info() calls to report such VMs as known but without a state.
@timf timf refresh caches as well 5b268a4
@timf timf increase signal/noise in test output fc83124
Commits on Nov 18, 2010
BuzzTroll refactor to preserve sanity. ee53c59
BuzzTroll conflict resolution
Merge branch 'master' of

BuzzTroll only not blocking on the 1 needed recv call. let sendall do its thing. 2b4a46c
Commits on Nov 19, 2010
@timf timf Tests were checking too early b8aea20
@labisso labisso Added multiple-subnet support to metadata server fc749ea
@labisso labisso Added support for /latest target in metadata query
Also added more list responses of available resources. e.g. /latest will return:

And /latest/meta-data/ will return:

Closes GH-9.
Commits on Nov 23, 2010
@timf timf Some additions to the developer section 03ecea7
@timf timf html formatting issues dcd6d74
@timf timf few more doc issues a3fb274
@timf timf html formatting issue (I can feel that look, David) 5524ea3
Commits on Nov 29, 2010
@labisso labisso Quickstart updates 0d07e2e
Commits on Dec 01, 2010
@labisso labisso Working on new admin walkthrough document 5f794cb
Commits on Dec 02, 2010
@labisso labisso More admin walkthrough 06e01c7
@timf timf no <tt> 1fe7033
@timf timf har har har 4e5aeab
@timf timf Thanks Pierre, this was important :-) 9b5edd2
Commits on Dec 03, 2010
@labisso labisso Added link to admin walkthrough in index page 7010925
Commits on Dec 09, 2010
BuzzTroll resolving: 292a4e6
BuzzTroll Merge branch 'master' of 6ada85e
BuzzTroll patch for: a6972c5
@labisso labisso Added query interface support for signature ver 1
Closes GH-17
@labisso labisso Walkthrough fixes I forgot to commit earlier c9f2d32
@labisso labisso Simple test for query interface v1 signatures 36f7bf1
@labisso labisso Oops, forgot self 46e6906
Commits on Dec 10, 2010
BuzzTroll patch for 915b447
BuzzTroll Merge branch 'master' of 3b9243a
@labisso labisso Make query interface XML more like EC2
but hybridfox still doesn't work entirely...
Commits on Dec 11, 2010
BuzzTroll adding prettier logging bf94a0e
@timf timf Merge remote branch 'origin/master' into finalspot e0008f4
Commits on Dec 13, 2010
@timf timf incorporation of backfill.conf and representation of backfill as SI '…
BuzzTroll forming error object with old variables 7054bae
BuzzTroll Merge branch 'master' of e7e0dac
BuzzTroll protecting /dev/null 28da588
@labisso labisso More EC2 query interface XML compatibility fixes
The expected API version is now reported regardless of the actual schema in use. This is convenient and dangerous.
Commits on Dec 14, 2010
BuzzTroll badpatch 3a51ce6
BuzzTroll Merge branch 'master' of 792111f
@labisso labisso Added readme, changelog, and license to ctx-agent a6e239f
@labisso labisso Added missing parenthesis 14c0d74
Commits on Dec 15, 2010
@labisso labisso Fixed support for POSTed EC2 query parameter lists
They were only working for GET queries, oops.

Closes GH-21.
@labisso labisso No @Override on interfaces in Java 5
Should check for this elsewhere?
@labisso labisso Updated ec2 schema to 2010-08-31 31a2fda
@labisso labisso Thread clientToken value through to RM API
Early piece of idempotency support
Commits on Dec 17, 2010
@labisso labisso CreationManager side of idempotency
Now need implementation of interfaces
@labisso labisso Idempotent creation works, minus persistence 74adc20
Commits on Dec 20, 2010
@oldpatricka oldpatricka Add locking to workspace pilot 289e5ab
@oldpatricka oldpatricka Implement simple proxy copying in service and client 80c6f68
@oldpatricka oldpatricka Cleanup service changes for copying a proxy 976d954
@oldpatricka oldpatricka Add https pulling with x509 credential to workspace control 12b45e5
@oldpatricka oldpatricka Add persistance and clean up credential copying.
Also do some cleanup.
@oldpatricka oldpatricka Change arguments to prop-extra-args to play nicely with other uses
Just in case someone else ever uses prop-extra-args for anything. Other
wc arguments seem to use the 'argument;argument;argument' format, so
repeat that here.
@oldpatricka oldpatricka Refactor CustomizationNeed to FileCopyNeed.
This way it can also be used for files that need to be copied to the VMM
node at Propagate time (credentials).

This also means that files that are contexed in are copied at
propagation time, rather than start time, as in the past.
@oldpatricka oldpatricka Fix restarting gzipped images.
Since the files will have been unzipped in a previous start attempt,
they will fail on a second attempt unless we check that they've already
been unzipped.
@oldpatricka oldpatricka Merge branch 'copyproxyandhttps' cee6e2f
@oldpatricka oldpatricka Allow multiple CPU architectures to be permitted 831246a
@oldpatricka oldpatricka Merge branch 'multiplecpuarchs' e33acdb
@oldpatricka oldpatricka Add http and https to the default list of passthrough schemes.
You'll still have to enable them in global-policies.conf
@labisso labisso hmm. 286 line file for a class that holds 7 values e9ae0a7
@labisso labisso Idempotent instance creation improvements & tests 1b2bcfb
Commits on Dec 21, 2010
@labisso labisso Threaded clientToken through more repr classes
Added to resources persistence and schema
@labisso labisso More idempotent creation tests, fixes 4b1d6b1
@labisso labisso Real persistence for idempotent launches
Feature is done, but I'd like to add some external boto tests to exercise via EC2 interface
Commits on Dec 22, 2010
@labisso labisso Translate clientToken in EC2 responses 9ca1261
@labisso labisso EC2-level idempotency tests and fixes
Problem: idempotency support is not present in released version of boto, tested with dev version.
@labisso labisso Adjusted elastic ID mgmt for idempotent launches
We cannot assume that the IDs in a CreateResult are new anymore. The response could from be a repeated idempotent request.
@labisso labisso More RM-level idempotency tests to be safe 03714a0
@labisso labisso More elastic interface tests and fixes
Ok, NOW I think idempotency support is done. And there are plenty of tests to support that claim.
Commits on Dec 27, 2010
@labisso labisso Moved python check to earlier in install script.
Prevents one more case where user ends up with a partial install.
@labisso labisso Added service dependency check script b2d6fad
@labisso labisso gcj writes version info to stdout, sun to stderr c57af92
@labisso labisso Fixed py2.5ism in dependency script 31ac5ab
BuzzTroll list out the to be rebased files so that the cursor object is closed 258f514
Commits on Dec 28, 2010
@timf timf Closes GH-22, see class notes in DefaultIDMgmtProxy 63281b6
@labisso labisso Added rename count output to cumulus-rebase 2adaba2
@labisso labisso Updated bundled to 1.5.1
Closes GH-13.
@labisso labisso Removed set -e from
Bash 4.x changes the behavior of "( cmd )" statements under set -e. Previously these commands would not trigger an exit but with 4.x they do. relied on the old behavior to ensure that umount is called even if the alter fails. Other commands in the script are checked for success, so we are safe in removing set -e.

Closes GH-18.
@timf timf merge metadata related changes to test suites 04f638f
@timf timf some IDEA nonsense f1b6b0e
@timf timf Merge remote branch 'origin/idem' into finalspot 5b887be
@timf timf Merge branch 'master' into finalspot
@labisso labisso Added updated EC2 schema wsdl
Forgot to commit earlier thanks to .gitignore
@timf timf updated the IDMappings proxy to match 7dfb1b3
@timf timf test suites up to date with recent conf/db changes 77ea333
@timf timf db snags, BasicSuite now passing 6f6fd8d
@timf timf The spotinstances tests unfortunately need this part commented out so…
… the confs are not identical (also, authz-callout-ACTIVE.xml is disabled)
Commits on Dec 29, 2010
@timf timf Callers assume a zero length array here if there are no file needs a81c983
@timf timf updated ehcache version 1.5.0 -> 2.3.1 dc5f788
Commits on Dec 30, 2010
@timf timf SI/backfill: persistence, deadlocks, and configuration issues. 6102029
@timf timf version bumps 0b4bc32
@labisso labisso First draft of 2.7 changelog 77034e0
@labisso labisso .idea stuff. ignore docs/html/ 144ab77
@labisso labisso 2.7 documentation version bumps bd2f49c
@labisso labisso Changelog fixes 29afd9b
Commits on Jan 03, 2011
@timf timf Account for the charge ratio in all the correct places. Spot price ha…
…s a convention of being between 0 and 1, this is implemented as a ratio of real minutes charged vs. wall clock.
Commits on Jan 04, 2011
@timf timf Tests pass after this change. Seems they shouldn't be non-zero after …
…cancellation, would be good for Paulo to look.
@timf timf Added ability to disable spot instances, backfill, or both. 697a850
@timf timf Added note about going back to disabled once enabled. 386c6ed
@timf timf Added note about going back to disabled once enabled. 3dc9253
@timf timf Notes on the conf differences in spotinstance test suites. 0de3a03
@timf timf The backfill user is now configurable (used for repo location) ca11ed1
@timf timf Confirmation from Paulo, re: 08b5742 b8253b9
Commits on Jan 05, 2011
@labisso labisso Validate length of idem clientToken in request a7b85e9
@timf timf Consolidated all backfill and spot settings to async.conf and moved t…
…he backfill submitter to 'org.globus.workspace.async'
@timf timf Moving this logic to a lower level Java module so Backfill will be ab…
…le to construct the same requests as SI.
@timf timf Adjust backfill to launch the same instance types as SI is configured…
… to do.
@labisso labisso don't catch SystemExit in bt ssh setup
how did this ever work? Seems like it would always exit 1
@timf timf raise not pass, a common SystemExit idiom bf7cd9d
@labisso labisso Fix boto tests to use connection-level terminate()
boto 1.9 -> 2.0 involved renaming Instance.stop() to terminate(). This
way we can support both versions.
@timf timf The change to allow multiple arches at once (831246a) broke the resou…
…rce property advertisement. Fixed.
Commits on Jan 06, 2011
@timf timf This starts to get spammy 6f85840
@timf timf Better defaults for running time e23da51
@timf timf docs for backfill/spot (spot client guide coming next) 3c422fd
@timf timf This option is only applicable if you are coming from Nimbus 2.5, the…
…re is a different path for 2.6
@timf timf These log statements were too high priority 9fb979d
@timf timf This option is only applicable if you are coming from Nimbus 2.5, the…
…re is a different path for 2.6
@timf timf Migrated Paulo's user document to html 2c5acec
@timf timf link to backfill/spot docs 80abeb2
@timf timf ToC entry for admin reference 025b24d
Commits on Jan 11, 2011
@timf timf Clear up why is used and not dir…
Commits on Jan 13, 2011
@timf timf Link to release procedures d51da26
Commits on Jan 18, 2011
@priteau priteau Bundle the lantorrent code in the nimbus-controls tarball
Also update the documentation to remove the now unnecessary installation
Commits on Jan 24, 2011
BuzzTroll updating the doc the show a dependency on py 2.5. There is a problem …
…with hmac and sha1 in 2.4
Commits on Jan 26, 2011
BuzzTroll fixing bug: 1dba047
Commits on Feb 02, 2011
@oldpatricka oldpatricka Fix help message in nimbus-remove-user. 3aa6d7f
Commits on Feb 03, 2011
@timf timf Closes GH-26, problem was expectation of fixed size instance types cl…
…ashed with arbitrary sized memory requests from the alternate protocol
@labisso labisso Cleanups to idempotency, added debug logging
Fixed one issue where the response to ec2-run-instances with an already-terminated instance broke the command line tool because there was no creation time. Now it returns a fake time instead.
@labisso labisso Fixed issue causing NPE in ec2-api-tools
(in ec2-describe-images)
BuzzTroll adding a note about the issue here: eb46dc5
BuzzTroll adding bug fixes to the change log 87330f5
BuzzTroll Merge branch 'master' of 035ddf9
@labisso labisso Added comments to main.xml about disabling idem
Also fixed a shameful omission of imports in last commit.
BuzzTroll adding doc and an example script on how to convert from 2.6 to 2.7 ce1b52f
BuzzTroll Merge branch 'master' of c2a4f93
Commits on Feb 04, 2011
BuzzTroll iversion bump 84f27cb
BuzzTroll adding a script to build and test the release tarballs c4f8887
bresnaha passes first phase 08431c7
@oldpatricka oldpatricka Cast parsed port to integer before passing to httplib in https adapter cc2d8de
@labisso labisso Fixed bug in running user-selected kernels
file:// prefix was not being stripped before comparision.
Closes GH-27.
bresnaha testing tarballs should work now d60538b
John Bresnahan Merge branch 'master' of git:// d3ed7dd
Commits on Feb 07, 2011
BuzzTroll changing the log level of an error f370bb7
BuzzTroll adding other fixed bugs and RC2 tags 7c59b1a
BuzzTroll Merge branch 'master' of ace5c6b
Commits on Feb 08, 2011
BuzzTroll changing the releaes version 34e6cbc
Commits on Feb 10, 2011
BuzzTroll adding data file to cumulus so that the source code is not zipped in …
…the egg

work arounds for eternal upload bug
BuzzTroll setting socket level timeout to infitiy. might be causing timeouts on…
… close
BuzzTroll adding a docs dir 6853cd4
BuzzTroll adjusting the directory e18f694
BuzzTroll porrly formed fixed ea3ddd7
BuzzTroll need to specify doc dir 978119e
BuzzTroll bug fix bc5ba93
BuzzTroll cannot reset md5 there.
need to figure out just what to do with the seek command.
BuzzTroll value need seems to be 1 8ffc6e6
BuzzTroll throw an error on the second seek. Twisted should be closing the conn…
…ection if it is respecting the headers so this should be safe
BuzzTroll bad string 33e05e7
Commits on Feb 11, 2011
BuzzTroll fixing use of seconds when milliseconds expected 5728131
BuzzTroll attempting to fix the 100% progress bar issue da50d2b
BuzzTroll fix 99% (instead of 100%) bug 0721aa0
BuzzTroll adding starting and stopping of the right nimbus servers e7b4792
BuzzTroll moving the example program 166c00d
BuzzTroll changing title c18ddeb
Commits on Feb 14, 2011
BuzzTroll opensuse spits out an escape sequence when readline is imported. This…
… causes trouble for the config programs
BuzzTroll test suite changes that were not copied back in b9829db
Commits on Feb 15, 2011
BuzzTroll script to download, extract, and then run tests on tarballs 22ff52d
BuzzTroll updatting change log for cloud client f9e45a0
BuzzTroll upping the cloud client version 14e7bb0
@timf timf maintain pattern 36c8b7d
@timf timf Upping version to final 2.7 01c0afa