Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
7110578
Update run.py
bethac07 May 13, 2020
19964e9
Delete fabfile.py
bethac07 May 13, 2020
bb81d2e
Move previous fab functions into run.py
bethac07 May 13, 2020
d15f63c
Debugging from lambda
bethac07 May 15, 2020
13058a4
tabs to spaces, issues/112
bethac07 Nov 3, 2020
e680795
merged in master
bethac07 Nov 3, 2020
dc73956
issues/105
bethac07 Nov 3, 2020
49a5d15
issues/110, fix passing USE_PLUGINS
bethac07 Nov 3, 2020
f307e29
fix tabs to spaces in run.py
bethac07 Nov 3, 2020
c4cb09c
tab/space error in run_batch_general
bethac07 Nov 3, 2020
e2ec8a0
issues/107
bethac07 Nov 3, 2020
a779061
issues/107
bethac07 Nov 3, 2020
50fe2f4
add 'cheapest' mode to monitor
bethac07 Nov 3, 2020
7ee2149
get credentials working
bethac07 Nov 3, 2020
e05c9d1
move machine type/price/date out of fleet file
bethac07 Nov 3, 2020
e6ded49
move machine type/price/date out of fleet file
bethac07 Nov 3, 2020
de17c9f
support running of monitor in cheapest mode
bethac07 Nov 3, 2020
318d78a
fix indentation in CHECK_IF_DONE
bethac07 Nov 3, 2020
dee8ea3
move cpDone
bethac07 Nov 3, 2020
5264a14
don't move done file, you still need to check it
bethac07 Nov 3, 2020
6d9e2ab
don't move done file, you still need to check it
bethac07 Nov 3, 2020
3deaa20
fix cmdstm for batch files
bethac07 Nov 3, 2020
0a0b27b
fixes to make log export work
bethac07 Nov 4, 2020
08e7fe8
python 3 support in run.py
bethac07 Nov 4, 2020
bc0afc6
move Python2 files to their own folder
bethac07 Nov 4, 2020
33a3a23
pin watchtower to last python2 version
bethac07 Nov 4, 2020
6e3c36f
support for CellProfiler 4
bethac07 Nov 4, 2020
54f77d0
fix alarm time designation
bethac07 Nov 4, 2020
186af22
Update README.md
bethac07 Nov 4, 2020
14c444e
Update requirements.txt
bethac07 Nov 4, 2020
dcfa1f7
Update LICENSE
bethac07 Nov 4, 2020
e0fcb72
Add a bit about run_batch_general
bethac07 Nov 5, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
issues/107
  • Loading branch information
bethac07 committed Nov 3, 2020
commit a779061066553b7fa5762db280b2bd08c7de63a7
9 changes: 4 additions & 5 deletions run.py
Original file line number Diff line number Diff line change
Expand Up @@ -437,16 +437,15 @@ def startCluster():
print('Your spot fleet request is causing an error and is now being cancelled. Please check your configuration and try again')
for eacherror in errorcheck['HistoryRecords']:
print(eacherror['EventInformation']['EventSubType'] + ' : ' + eacherror['EventInformation']['EventDescription'])
shutoff = True
#If there's only one error, and it's the type we see for insufficient capacity (but also other types)
#AND if there are some machines on, indicating that other than capacity the spec is otherwise good, don't cancel
if len(errorcheck['HistoryRecords']) == 1:
if errorcheck['HistoryRecords'][0]['EventInformation']['EventSubType'] == 'allLaunchSpecsTemporarilyBlacklisted':
if len(status['ActiveInstances']) >= 1:
shutoff = False
if shutoff:
ec2client.cancel_spot_fleet_requests(SpotFleetRequestIds=[requestInfo['SpotFleetRequestId']], TerminateInstances=True)
return
print("I think, but am not sure, that this is an insufficient capacity error. You should check the console for more information.")
return
ec2client.cancel_spot_fleet_requests(SpotFleetRequestIds=[requestInfo['SpotFleetRequestId']], TerminateInstances=True)
return

# If everything seems good, just bide your time until you're ready to go
print('.')
Expand Down