[ARVADOS] updated: 8dea7244cf5e50b9fa70bec15b1db3fd2cdd03bf
git at public.curoverse.com
git at public.curoverse.com
Fri May 9 23:04:13 EDT 2014
Summary of changes:
apps/workbench/app/models/pipeline_instance.rb | 2 +-
.../pipeline_instances/_show_components.html.erb | 2 +-
sdk/cli/bin/arv-run-pipeline-instance | 13 ++----------
sdk/python/MANIFEST.in | 1 -
sdk/python/requirements.txt | 14 ++++++-------
sdk/python/setup.py | 3 +--
sdk/python/setup.py.src | 23 ----------------------
sdk/python/setup_header.py | 19 ------------------
services/api/app/models/pipeline_instance.rb | 4 ++--
services/fuse/.gitignore | 1 +
.../fuse/arvados_fuse}/__init__.py | 0
{sdk/python => services/fuse}/bin/arv-mount | 2 +-
{sdk/python => services/fuse}/readme.llfuse | 0
services/fuse/requirements.txt | 3 +++
services/fuse/run_test_server.py | 1 +
sdk/python/setup_fuse.py => services/fuse/setup.py | 11 ++++++-----
{sdk/python => services/fuse}/test_mount.py | 2 +-
17 files changed, 26 insertions(+), 75 deletions(-)
delete mode 100644 sdk/python/MANIFEST.in
delete mode 100644 sdk/python/setup.py.src
delete mode 100644 sdk/python/setup_header.py
create mode 120000 services/fuse/.gitignore
rename {sdk/python/arvados/fuse => services/fuse/arvados_fuse}/__init__.py (100%)
rename {sdk/python => services/fuse}/bin/arv-mount (99%)
rename {sdk/python => services/fuse}/readme.llfuse (100%)
create mode 100644 services/fuse/requirements.txt
create mode 120000 services/fuse/run_test_server.py
rename sdk/python/setup_fuse.py => services/fuse/setup.py (71%)
rename {sdk/python => services/fuse}/test_mount.py (99%)
via 8dea7244cf5e50b9fa70bec15b1db3fd2cdd03bf (commit)
via 9da4a83c2cb602e872bb606503fa438dd3296864 (commit)
via 2d79630f56a010aa0b7544b876c7c31b122c70af (commit)
via 3c3bc28bc6c991d8111dd66bfef6fe310e00f232 (commit)
via 949e27e0dd0a97cf78f0b90636df387fa0d65be3 (commit)
via b20333af04a3507b85c52cc4e50a0e2c3fc04433 (commit)
via a7100af369a892a7f38eb2875320a7c742ec4da8 (commit)
via 60c604d8e89501af180487ae7b39c1e25a66c8f3 (commit)
via b249529bb02dd34e54f8816222ebf81d778c957b (commit)
from faf355bede4c4a9b01ef5658fa925cec6e4b503f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 8dea7244cf5e50b9fa70bec15b1db3fd2cdd03bf
Author: radhika <radhika at curoverse.com>
Date: Fri May 9 23:00:23 2014 -0400
2352: Address review feedback: (1) input can be edited even in Ready state, (2) pipeline cleanup to set state to Paused if RunningOnClient.
diff --git a/apps/workbench/app/models/pipeline_instance.rb b/apps/workbench/app/models/pipeline_instance.rb
index 93e9509..45e472f 100644
--- a/apps/workbench/app/models/pipeline_instance.rb
+++ b/apps/workbench/app/models/pipeline_instance.rb
@@ -19,7 +19,7 @@ class PipelineInstance < ArvadosBase
def attribute_editable?(attr)
attr && (attr.to_sym == :name ||
- (attr.to_sym == :components and self.state == 'New'))
+ (attr.to_sym == :components and (self.state == 'New' || self.state == 'Ready')))
end
def attributes_for_display
diff --git a/apps/workbench/app/views/pipeline_instances/_show_components.html.erb b/apps/workbench/app/views/pipeline_instances/_show_components.html.erb
index 3fae559..92da0d5 100644
--- a/apps/workbench/app/views/pipeline_instances/_show_components.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_show_components.html.erb
@@ -100,7 +100,7 @@ setInterval(function(){$('a.refresh').click()}, 15000);
<% end %>
<% end %>
- <% if @object.state == 'New' %>
+ <% if @object.state.in? ['New', 'Ready'] %>
<%= render partial: 'show_components_editable', locals: {editable: true} %>
<% else %>
<%= render partial: 'show_components_editable', locals: {editable: false} %>
diff --git a/sdk/cli/bin/arv-run-pipeline-instance b/sdk/cli/bin/arv-run-pipeline-instance
index 0550bbc..b86b217 100755
--- a/sdk/cli/bin/arv-run-pipeline-instance
+++ b/sdk/cli/bin/arv-run-pipeline-instance
@@ -541,7 +541,6 @@ class WhRunPipelineInstance
end
end
@instance[:components] = @components
-# @instance[:active] = moretodo
report_status
if @options[:no_wait]
@@ -555,7 +554,6 @@ class WhRunPipelineInstance
debuglog "interrupt", 0
interrupted = true
break
- #abort
end
end
end
@@ -580,18 +578,12 @@ class WhRunPipelineInstance
if interrupted
if success
-# @instance[:active] = false
-# @instance[:success] = success
@instance[:state] = 'Complete'
else
-# @instance[:active] = nil
-# @instance[:success] = nil
@instance[:state] = 'Paused'
end
else
if ended == @components.length or failed > 0
-# @instance[:active] = false
-# @instance[:success] = success
@instance[:state] = success ? 'Complete' : 'Failed'
end
end
@@ -604,9 +596,8 @@ class WhRunPipelineInstance
end
def cleanup
- if @instance
-# @instance[:active] = false
- @instance[:state] = 'New' # should it be Failed?
+ if @instance and @instance[:state] == 'RunningOnClient'
+ @instance[:state] = 'Paused'
@instance.save
end
end
diff --git a/services/api/app/models/pipeline_instance.rb b/services/api/app/models/pipeline_instance.rb
index 24253bf..cea0ff6 100644
--- a/services/api/app/models/pipeline_instance.rb
+++ b/services/api/app/models/pipeline_instance.rb
@@ -196,8 +196,8 @@ class PipelineInstance < ArvadosModel
end
if new_record? or 'components'.in? changed_attributes
- state ||= New
- if state == New and self.components_look_ready?
+ self.state ||= New
+ if self.state == New and self.components_look_ready?
self.state = Ready
end
end
commit 9da4a83c2cb602e872bb606503fa438dd3296864
Merge: faf355b 2d79630
Author: radhika <radhika at curoverse.com>
Date: Fri May 9 20:22:26 2014 -0400
Merge branch 'master' into 2352-remove-attrs
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list