Release 0.7.2 changes from Development

* roll back untested log cleanup feature * fix bug that masked errors in failed docker pull attempts by taskmonitor * delete cmd for runs, templates, files * run deletion handles datanodes, children * object deletion from cmdline client * cleanup runs with invalid user_inputs * file export handles metadata * file import handles metadata * track linked files in database * refactor FileManager into Export/ImportManager * unit tests for loomengine_utils.connection * wildcards for google storage, unit tests for file_utils * loomengine_utils unittests * template bulk export * template cleans up DataNodes on delete * migrate template import to utils * ensure DataNode children are sorted by index * import templates with dependencies * bulk-import templates * bulk-import runs * attach nested objects on run import * finish removing django-mptt * optimize deserialization * update template and run export * update loomengine_utils unit tests * push outputs before setting run status to finished * bugfix GOOGLE_STORAGE_BUCKET setting * fix docker-compose tests * lookup template_id for channel validation * fix bug preventing creation of multiple steps by id * rerun mechanism is working * "loom run restart" and "--force-rerun" * bundled inputs * ip_forward true on gcp instances * fix migration for m2m task to task-attempt * fix Task.is_responsive method * added .travis.yml * add build-loom-packages to .travis.yaml * remove .travis.yml * add mptt to server requirements to support old migrations * add set pipefail in bin/run-tests.sh * add Jenkinsfile * update Jenkinsfile * remove "source" from Jenkinsfile * fix loomengine_utils.test.test_file_utils.TestLocalFilePattern.testWildcard * build docker image * change Jenkinsfile from declarative to script * typo in Jenkinsfile * change Jenkinsfile to declarative syntax * missing quotes in Jenkinsfile * inspect env * set noTags False in Jenkinsfile * fix parentheses in Jenkinsfile * set version as GIT_COMMIT first 10 chars * revert Jenkinsfile to default checkout * set-version handles missing doc * remove versions from source control * add git push to Jenkinsfile * remove VERSION from Dockerfile * fix version file handling * enable docker build with no build-args * Jenkinsfile runs integration test stage on certain branches * Jenkinsfile fix tag in docker run * Jenkinsfile fix tag in docker push * fix regex in Jenkinsfile * Jenkinsfile fix regex * fix Jenkinsfile regex * fix regex in Jenkinsfile * fix Jenkinsfile regex * fix regex in Jenkinsfile * Jenkinsfile add buildingTag to integration test stage * Jenkinsfile conditional LOOM_VERSION either tag or commit * Jenkinsfile rewrite LOOM_VERSION logic * convert Jenkinsfile to scripted * debug Jenkinsfile * revert to declarative Jenkinsfile format * add deployment and integration tests * fix Jenkinsfile typo * fix Jenkinsfile typo * Jenkinsfile installs loom client locally * rename postBuild-->post in Jenkinsfile * Jenkinsfile fix path for set-version.sh * fix typos in Jenkinsfile * remove dependency on gsutil and gcloud from client * Jenkinsfile authenticate loom user * Jenkinsfile fix pw_generator * Jenkinsfile get Loom admin credentials from jenkins * Jenkinsfile set username and password on loom server start * add GOOGLE_APPLICATION_CREDENTIALS to Jenkinsfile environment * Jenkinsfile typo * Jenkinsfile increase timeout on integration tests * use ssh-keys, not sshKeys, to not override GCE project keys * fix typo in gcloud_start_server playbook * add refresh_inventory to get instance metadata * add missing ssh_private_key_path var in playbooks * revert changes that removed gcloud from ansible * remove "ansible-generated" note from ssh keys * Tag Docker image with the current branch * typo in jenkinsfile * Jenkinsfile wrap conditional steps in script block * Jenkinsfile remove redundant tag in docker build * fix invalid LOOM_SERVER_NAME in Jenkinsfile * Jenkinsfile configure email * Jenkinsfile add loom server cleanup * Jenkinsfile fix typo * reenable task_attempt cleanup * Jenkinsfile typos * Jenkinsfile typo * Jenkinsfile fix email formatting * Jenkinsfile add confirm-server-name to loom server delete * fix task_attempt cleanup, refactor async * fix unittests * Jenkinsfile release to PyPi if tag exists * Jenkinsfile add smoketest to pypi release * fix Jenkinsfile syntax * Jenkinsfile replace disallowed chars in LOOM_SERVER_NAME * Fix Jenkinsfile syntax * debug Jenkinsfile * debug Jenkinsfile * validate version during build * allow alphanumeric version for dev builds * typo in Jenkinsfile * fixed export of file array inputs in worker * add debug env output to Jenkinsfile * fix Jenkinsfile syntax * Jenkinsfile make LOOM_SERVER_NAME all lowercase * fix retries * cleanup tmp working directory after TaskAttempt * delete token on loom server disconnect * fix retries (#513) * change WORKING_DIR settings in task_monitor inputs/outputs * Make "loom template import missing.file" raise an error * raise ValidationError for duplicate step name * improve client message for google.cloud.exceptions.InternalServerError * improve message for "loom server start" --extra-settings with invalid format * fix import error * fix import errors * never retry on google.cloud.exceptions.Forbidden * check for duplicate user_inputs in run validation * CSRF_COOKIE_SECURE and SESSION_COOKIE_SECURE * require LOOM_HTTPS_PORT_ENABLED if LOOM_LOGIN_REQUIRED * eliminate worker scratch disks * fix retries for resolving EPEL repo * handle preexisting TaskAttempts on Run import * respect --force-rerun on retries * Task serializer does not require data_path * added cleanup to RunSerializer * cascade deletion to run/template children unless protected * LOOM_DISABLE_DELETE prevents object deletion * do not mount .ssh dir on server * add debug info * increase time for ssh keys to propagate to GCP instance * 5s timeout on status requests from client * fix timeout arg in unittests * Client errors with pretty message, no traceback * validate tags and labels as alphanumeric * fix import error * create bootdisk and instance in one step to avoid leaving disk on failure * Extend interactive test timeout * remove "disk_type" setting, not supported by ansible gce module * create settings bundle and copy it to server * show server configuration errors in terminal * Client prompts to login if 403 error * update unittests * introduce timeout to kill long-running tasks * no traceback on client init errors * include both TaskAttempt containers in cleanup * refactor client tests * fix cleanup and error msg for runs with missing inputs * update unit test * refactor integration test * lock down kombu version * change how template import/export handles steps * add playbooks to MANIFEST.in for client package * fix recursive-include syntax * handle duplicate TaskAttempts on run import * rename test settings * migrate prefetch methods to models * preserve relative file path on export/import * fix unittests * refactor serializers inheritance * fix get_data_nodes on task_attempts * FilterMixin can lookup multiple references at once * add filter options back to FileResource * partial work on RunSerializer * partial work on RunSerializer - connect i/o * partial work on Runserializer - import * partial work on RunSerializer - bulk_create DataNodes * partial work on RunSerializer - bulk_create DataObjects * refactor async tasks * completed RunSerializer refactor * update unit tests * remove "sleep" from delayed TaskAttempt retries * Allow delayed save when creating DataNodes * InputCalculator works per run, no more target channel * update requirements * require requests>=2.5.0 in loom_utils * add pycrypto to dependencies * display Loom version and template md5 in browser (#547) * Added documentation on output parser and glob strings (#548) * clarify error for duplicate file names in a task (#549) * "loom server stop" uses internal ip when needed (#550) * Prerelease 0.7.0 (#551) * update release notes for 0.7.0 * fix PyPi test, doc version * update jenkins configuration * correct typo in Jenkinsfile * client and worker pass pycodestyle checks (#553) * Issue 554 (#557) * remove comma from SQL CASE statements * set persistent_boot_disk=True, fixes ignored disk size setting * add elasticsearch and curator to loom server dependencies * fix sql syntax in case statements * Prerelease 0.7.1 (#558) * update releasenotes for 0.7.1, Jenkins runs full integration tests for tagged releases * correct jenkins stage name for integration tests * Add doc build test * allow integration tests to run with self-signed cert * bugfix matching DataNodes to TaskOutputs for bulk_create * Task.create_unsaved_task_from_input_set returns correct types if no new task * fix bug in output routing for parallel steps * Use full git hash as version bc setuptools normalization edits short hash * add workspace cleanup step (#565) * add size and index special functions to jinja dict in templates (#567) * remove debug stop * Fix import of -e nested templates with preexisting children (#573) * 574 duplicate task attempts (#575) * Kill child task_attempts before retry * remove redundant kill_children command * migrate Dockerfile to ubuntu 18.04 (#580) * use force_rerun settings in bulk_create_tasks (#581) * 0.7.2 release notes * --no-cache on docker build * move Docker loom install to /opt * moved playbook paths to /opt/loom * change install path in Jenkinsfile * lengthen retries for pulling from pypi * no run contents in list view due to performance, moved to detail * remove links to kibana logs * refactor portal's data cache to eliminate stale data * hide steps in run detail if none exist * show nested steps in template detail * migrate to python3 * changes for python3 migration * roll back python3 changes * raise warning, not error, if version not PEP440 * Restrict django<2 for python2 compatibility * Prerelease 0.7.2 (#584) * 0.7.2 release notes * --no-cache on docker build * move Docker loom install to /opt * moved playbook paths to /opt/loom * change install path in Jenkinsfile * lengthen retries for pulling from pypi * no run contents in list view due to performance, moved to detail * remove links to kibana logs * refactor portal's data cache to eliminate stale data * hide steps in run detail if none exist * show nested steps in template detail * migrate to python3 * changes for python3 migration * roll back python3 changes * raise warning, not error, if version not PEP440 * Restrict django<2 for python2 compatibility * restore links to logs in sidebar and run detail * update release notes
StanfordBioinformatics · Feb 23, 2019 · db2031a · db2031a
1 parent 1033757
commit db2031a
Show file tree

Hide file tree

Showing 39 changed files with 366 additions and 474 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,10 +1,11 @@
-FROM debian:jessie
+FROM ubuntu:18.04
 MAINTAINER Nathan Hammond <info@loomengine.org>
 
 # Install gcloud SDK.
 RUN apt-get update && apt-get install -y \
     curl \
     lsb-release \
+    gnupg \
     openssh-client \
     && CLOUD_SDK_REPO="cloud-sdk-$(lsb_release -c -s)" \
     && echo "deb http://packages.cloud.google.com/apt $CLOUD_SDK_REPO main" | tee /etc/apt/sources.list.d/google-cloud-sdk.list \
@@ -19,10 +20,16 @@ RUN apt-get update && apt-get install -y \
 RUN apt-get update && apt-get install -y \
     apt-transport-https \
     ca-certificates \
-    && apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D \
-    && echo 'deb https://apt.dockerproject.org/repo debian-jessie main' > /etc/apt/sources.list.d/docker.list
+    curl \
+    gnupg-agent \
+    software-properties-common \
+    && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
+    && add-apt-repository \
+     "deb [arch=amd64] https://download.docker.com/linux/ubuntu \
+     $(lsb_release -cs) stable"
+
 RUN apt-get update && apt-get install -y \
-    docker-engine \
+    docker-ce docker-ce-cli containerd.io \
     && apt-get autoremove \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
@@ -31,30 +38,29 @@ RUN apt-get update && apt-get install -y \
 RUN apt-get update && apt-get install -y \
     build-essential \
     libffi-dev \
-    libmysqlclient-dev \
+    libmariadbclient-dev \
     libssl-dev \
     python-dev \
     python-pip \
     && apt-get autoremove \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-# Install Loom's python dependencies
 RUN pip install -U pip
 
 # Install Loom
 ADD ./portal /var/www/loom/portal
-ADD ./client /loom/src/client
-ADD ./server /loom/src/server
-ADD ./utils /loom/src/utils
-ADD ./worker /loom/src/worker
-ADD ./bin /loom/src/bin
-ADD ./NOTICES /loom/src/NOTICES
-ADD ./LICENSE /loom/src/LICENSE
-ADD ./README.rst /loom/src/README.rst
-ADD ./build-tools /loom/src/build-tools
+ADD ./client /opt/loom/src/client
+ADD ./server /opt/loom/src/server
+ADD ./utils /opt/loom/src/utils
+ADD ./worker /opt/loom/src/worker
+ADD ./bin /opt/loom/src/bin
+ADD ./NOTICES /opt/loom/src/NOTICES
+ADD ./LICENSE /opt/loom/src/LICENSE
+ADD ./README.rst /opt/loom/src/README.rst
+ADD ./build-tools /opt/loom/src/build-tools
 ARG LOOM_VERSION
-RUN cd /loom/src/build-tools \
+RUN cd /opt/loom/src/build-tools \
     && ./set-version.sh \
     && ./build-loom-packages.sh \
     && ./install-loom-packages.sh \

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -51,7 +51,7 @@ pipeline {
     }
     stage('Unit Tests') {
       steps {
-        sh 'docker run loomengine/loom:${VERSION} /loom/src/bin/run-unit-tests.sh'
+        sh 'docker run loomengine/loom:${VERSION} /opt/loom/src/bin/run-unit-tests.sh'
       }
     }
     stage('Push Docker Image') {
@@ -130,7 +130,7 @@ pipeline {
       when {
         expression { env.TAG_NAME }
       }
-      options { retry(30) } // Retry for up to 600 seconds (plus runtime)
+      options { retry(45) } // Retry for up to 900 seconds (plus runtime)
       steps {
         sh 'sleep 20'
         sh 'rm -rf env-pypi && virtualenv env-pypi'
@@ -146,6 +146,8 @@ pipeline {
         if (loomServerStarted) {
           sh '. env/bin/activate && loom server delete --confirm-server-name ${LOOM_SERVER_NAME}'
 	}
+	// uses Workspace Cleanup Plugin to delete workspace dir.
+	cleanWs()
       }
     }
     success {

diff --git a/build-tools/docker-build.sh b/build-tools/docker-build.sh
@@ -19,4 +19,4 @@ fi
 echo Version set to \"$version\"
 echo Building docker image loomengine/loom:$version
 
-docker build .. -t loomengine/loom:$version
+docker build .. -t loomengine/loom:$version --no-cache
diff --git a/build-tools/set-version.sh b/build-tools/set-version.sh
@@ -21,11 +21,8 @@ fi
 # We also allow alphanumeric strings to support using git commit versions in development builds.
 N=\[0-9\]+
 PEP440_VERSION="${N}(\.${N})*((a|b|rc)${N}|\.(post|dev)${N})?"
-ALPHANUM_VERSION="[a-zA-Z0-9]+"
-VALID_VERSION="(${PEP440_VERSION}|${ALPHANUM_VERSION})"
-if [[ ! "$version" =~ ^${VALID_VERSION}$ ]]; then
-    echo "ERROR! Invalid version" $version "does not follow PEP 440. See https://www.python.org/dev/peps/pep-0440/#public-version-identifiers"
-    exit 1
+if [[ ! "$version" =~ ^${PEP440_VERSION}$ ]]; then
+    echo "WARNING! Invalid version \"$version\" does not follow PEP 440. See https://www.python.org/dev/peps/pep-0440/#public-version-identifiers"
 fi
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

diff --git a/client/loomengine/playbooks/tasks/start_server_containers.yml b/client/loomengine/playbooks/tasks/start_server_containers.yml
@@ -123,7 +123,7 @@
   docker_container:
     name: "{{worker_container_name}}"
     image: "{{loom_docker_image}}"
-    command: /loom/src/bin/run-worker.sh
+    command: /opt/loom/src/bin/run-worker.sh
     restart_policy: always
     api_version: auto
     env_file: "{{server_settings_home}}/{{server_settings_file}}"
@@ -152,7 +152,7 @@
   docker_container:
     name: "{{scheduler_container_name}}"
     image: "{{loom_docker_image}}"
-    command: /loom/src/bin/run-scheduler.sh
+    command: /opt/loom/src/bin/run-scheduler.sh
     restart_policy: always
     api_version: auto
     env_file: "{{server_settings_home}}/{{server_settings_file}}"
@@ -180,7 +180,7 @@
     name: "{{flower_container_name}}"
     hostname: "{{flower_container_name}}"
     image: "{{loom_docker_image}}"
-    command: /loom/src/bin/run-flower.sh
+    command: /opt/loom/src/bin/run-flower.sh
     restart_policy: always
     api_version: auto
     env_file: "{{server_settings_home}}/{{server_settings_file}}"
@@ -202,7 +202,7 @@
     name: "{{server_container_name}}-check"
     hostname: "{{server_container_name}}"
     image: "{{loom_docker_image}}"
-    command: /loom/src/bin/check-database.sh
+    command: /opt/loom/src/bin/check-database.sh
     interactive: yes
     detach: no
     cleanup: yes
@@ -227,7 +227,7 @@
     name: "{{server_container_name}}"
     hostname: "{{server_container_name}}"
     image: "{{loom_docker_image}}"
-    command: /loom/src/bin/run-server.sh
+    command: /opt/loom/src/bin/run-server.sh
     restart_policy: always
     api_version: auto
     env_file: "{{server_settings_home}}/{{server_settings_file}}"

diff --git a/client/loomengine/template.py b/client/loomengine/template.py
@@ -89,8 +89,11 @@ def run(self):
                         retry=self.args.retry,
                         link_files=self.args.link_files)
                 except LoomengineUtilsError as e:
+                    msg = str(e)
+                    if not msg:
+                        msg = e.__class__
                     raise SystemExit(
-                        "ERROR! Failed to import template: '%s'" % e)
+                        "ERROR! Failed to import template: '%s'" % msg)
                 self._apply_tags(template)
                 self._apply_labels(template)
                 imported_templates.append(template)

diff --git a/doc/releasenotes.rst b/doc/releasenotes.rst
@@ -2,6 +2,17 @@
 Release Notes
 #############
 
+0.7.2
+------------
+* Bug fixes:
+  - The force_rerun setting was being ignored
+  - Duplicate task attempts were being created on failure
+  - Fixed import of nested templates with preexisting children
+  - Python package conflicts resolved, migrated Docker image to ubuntu
+  - Fixes to the Jenkins pipeline
+* Added "size" and "index" special functions to workflow language
+* Refactored views in portal for better performance
+
 0.7.1
 ------------
 * Bug fixes:

diff --git a/doc/templates.rst b/doc/templates.rst
@@ -301,6 +301,22 @@ Why should we bother differentiating between "gather" and "gather(2)"? This exam
    # Run with custom input data
    loom run start sentence_scoring sentence='To infinity and beyond'
 
+*****************
+Special functions
+*****************
+
+The examples above demonstrated how jinja template notation can be used to incorporate input values into commands, e.g. "echo {{input1}}". The template context contains all input channel names as keys, but it also contains the special functions below.
+
+If an input uses the same name as a special function, the input value overrides.
+
+index
+=====
+*index[i]* returns the one-based index of the current task. So if a run contains 3 parallel tasks, *index[1]* will return value 1, 2, or 3 for the respective tasks. If the run contains nested parallel tasks, *index[i]* will return the index of the task in dimension *i*. If *i* is a positive integer larger than the dimensionality of the tasks, it will return a default value of 1  (e.g. *index[1]*, *index[2]*, etc. all return 1 for scalar data.). If *i* is not a positive integer value, a validation error will result.
+
+size
+====
+*size[i]* returns the size of the specified dimension. So if a run contains 3 parallel tasks, *size[1]* will return a value of 3 for all tasks. If the run contains nested parallel tasks, *size[i]* will return the size of dimension *i*. If *i* is a positive integer larger than the dimensionality of the tasks, it will return a value of 1 (e.g. *size[1]*, *size[2]*, etc. all return 1 for scalar data). If *i* is not a positive integer value, a validation error will result.
+
 *******
 Schemas
 *******

diff --git a/portal/index.html b/portal/index.html
@@ -96,7 +96,6 @@
   <script src="scripts/controllers/version.controller.js"></script>
   <script src="scripts/controllers/runList.controller.js"></script>
   <script src="scripts/controllers/runDetail.controller.js"></script>
-  <script src="scripts/controllers/runContents.controller.js"></script>
   <script src="scripts/controllers/taskDetail.controller.js"></script>
   <script src="scripts/controllers/taskAttemptDetail.controller.js"></script>
   <script src="scripts/controllers/templateList.controller.js"></script>
@@ -105,8 +104,6 @@
   <script src="scripts/controllers/resultFileList.controller.js"></script>
   <script src="scripts/controllers/logFileList.controller.js"></script>
   <script src="scripts/controllers/fileDetail.controller.js"></script>
-  <script src="scripts/directives/collapseAll.directive.js"></script>
-  <script src="scripts/directives/expandAll.directive.js"></script>
   <script src="scripts/directives/loomData.directive.js"></script>
   <script src="scripts/filters/parseId.filter.js"></script>
   <script src="scripts/filters/statusColor.filter.js"></script>

diff --git a/portal/partials/breadcrumb.html b/portal/partials/breadcrumb.html
@@ -1,14 +1,14 @@
 <h4 class="sub-header">
   <ol class="breadcrumb" ng-show="$location.$$path.startsWith('/runs')"> 
     <li><a href="#/runs">Runs</a></li>
-    <li ng-show="params.runId"><a ng-href="#/runs/{{params.runId}}">{{activeData.run.name}}</a></li>
+    <li ng-show="activeData.focus.uuid"><a ng-href="#/runs/{{activeData.focus.uuid}}">{{activeData.focus.name}}@{{activeData.focus.uuid | limitTo:8}}</a></li>
   </ol>
   <ol class="breadcrumb" ng-show="$location.$$path.startsWith('/templates')">
     <li><a href="#/templates">Templates</a></li>
-    <li ng-show="params.templateId"><a ng-href="#/templates/{{params.templateId}}">{{activeData.template.name}}</a></li> 
+    <li ng-show="activeData.focus.uuid"><a ng-href="#/templates/{{activeData.focus.uuid}}">{{activeData.focus.name}}@{{activeData.focus.uuid | limitTo:8}}</a></li> 
   </ol>
   <ol class="breadcrumb" ng-show="$location.$$path.startsWith('/files')">
     <li>Files</li>
-    <li ng-show="params.dataId"><a ng-href="#/data/{{params.dataId}}">{{activeData.data.file_content.filename}}</a></li>
+    <li ng-show="activeData.focus.uuid"><a ng-href="#/files/{{activeData.focus.uuid}}">{{activeData.focus.value.filename}}@{{activeData.focus.uuid | limitTo:8}}</a></li>
   </ol>
 </h4>
diff --git a/portal/partials/run-contents.html b/portal/partials/run-contents.html
diff --git a/portal/partials/sidebar.html b/portal/partials/sidebar.html
@@ -3,8 +3,5 @@
     <li ng-class="{active: $location.$$path.startsWith('/runs')}"><a href="#/runs">Runs</a></li>
     <li ng-class="{active: $location.$$path.startsWith('/templates')}"><a href="#/templates">Templates</a></li>
     <li ng-class="{active: $location.$$path.startsWith('/files')}"><a href="#/files">Files</a></li>
-    <li><a target="_blank" ng-href="{{$location.protocol()}}://{{$location.host()}}/logs/app/kibana#/discover?_g=(refreshInterval:(display:'5%20seconds',pause:!f,section:1,value:5000),time:(from:now%2Fy,mode:quick,to:now))&_a=(columns:!(log,container_name),index:'*',interval:auto,query:(query_string:(analyze_wildcard:!t,query:'*')),sort:!('@timestamp',desc))">
-        Logs &nbsp;<span class="glyphicon glyphicon-new-window" aria-hidden="true"></span>
-    </a></li>
   </ul>
 </div>
diff --git a/portal/scripts/controllers/auth.controller.js b/portal/scripts/controllers/auth.controller.js
@@ -13,7 +13,7 @@
             // autofill-event polyfill [4][5]
             $('#id_auth_form input').checkAndTriggerAutoFillEvent();
 
-	$scope.activeData = DataService.getAllActive();
+	$scope.activeData = DataService.getActiveData();
 	DataService.getLoginAndVersionInfo();
         $scope.getCredentials = function(){
 	    return {username: $scope.username, password: $scope.password};

diff --git a/portal/scripts/controllers/breadcrumb.controller.js b/portal/scripts/controllers/breadcrumb.controller.js
@@ -10,7 +10,7 @@
     function BreadcrumbController($scope, DataService, $location, $routeParams) {
 	$scope.$location = $location;
 	$scope.params = $routeParams;
-	$scope.activeData = DataService.getAllActive();
+	$scope.activeData = DataService.getActiveData();
     };
 
 }());
diff --git a/portal/scripts/controllers/fileDetail.controller.js b/portal/scripts/controllers/fileDetail.controller.js
@@ -10,7 +10,7 @@ FileDetailController.$inject = [
 ];
 
 function FileDetailController($scope, DataService, $routeParams) {
-    $scope.activeData = DataService.getAllActive();
+    $scope.activeData = DataService.getActiveData();
     $scope.loading = true;
     DataService.setActiveFile($routeParams.fileId).then(function() {
 	$scope.loading = false;

diff --git a/portal/scripts/controllers/runContents.controller.js b/portal/scripts/controllers/runContents.controller.js
diff --git a/portal/scripts/controllers/runDetail.controller.js b/portal/scripts/controllers/runDetail.controller.js
@@ -10,7 +10,7 @@ RunDetailController.$inject = [
 ];
 
 function RunDetailController($scope, DataService, $routeParams) {
-    $scope.activeData = DataService.getAllActive();
+    $scope.activeData = DataService.getActiveData();
     $scope.loading = true;
     DataService.setActiveRun($routeParams.runId).then(function() {
 	$scope.loading = false;

diff --git a/portal/scripts/controllers/taskAttemptDetail.controller.js b/portal/scripts/controllers/taskAttemptDetail.controller.js
@@ -11,7 +11,7 @@ TaskAttemptDetailController.$inject = [
 
 function TaskAttemptDetailController($scope, DataService, $routeParams, $location) {
     $scope.$location = $location;
-    $scope.activeData = DataService.getAllActive();
+    $scope.activeData = DataService.getActiveData();
     $scope.loading = true;
     DataService.setActiveTaskAttempt($routeParams.taskAttemptId).then(function() {
 	$scope.loading = false;

diff --git a/portal/scripts/controllers/taskDetail.controller.js b/portal/scripts/controllers/taskDetail.controller.js
@@ -10,7 +10,7 @@ TaskDetailController.$inject = [
 ];
 
 function TaskDetailController($scope, DataService, $routeParams) {
-    $scope.activeData = DataService.getAllActive();
+    $scope.activeData = DataService.getActiveData();
     $scope.loading = true;
     DataService.setActiveTask($routeParams.taskId).then(function() {
 	$scope.loading = false;