Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 23 additions & 1 deletion client/platform/web-girder/views/Jobs.vue
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
<script lang="ts">
import { defineComponent, ref } from '@vue/composition-api';
import {
defineComponent, ref, toRef, watch,
} from '@vue/composition-api';
import { GirderJobList } from '@girder/components/src';
import { setUsePrivateQueue } from 'platform/web-girder/api';
import { useGirderRest } from 'platform/web-girder/plugins/girder';
import { useStore } from '../store/types';

export default defineComponent({
name: 'Jobs',
Expand All @@ -11,6 +14,14 @@ export default defineComponent({
const privateQueueEnabled = ref(false);
const loading = ref(true);
const restClient = useGirderRest();
const store = useStore();
const outstandingJobs = ref(0);

watch(toRef(store.getters, 'Jobs/runningJobIds'), () => {
restClient.get('job/queued').then(({ data }) => {
outstandingJobs.value = data.outstanding;
});
});

async function setPrivateQueueEnabled(value: boolean) {
loading.value = true;
Expand All @@ -24,10 +35,14 @@ export default defineComponent({
privateQueueEnabled.value = user.user_private_queue_enabled;
loading.value = false;
});
restClient.get('job/queued').then(({ data }) => {
outstandingJobs.value = data.outstanding;
});

return {
privateQueueEnabled,
loading,
outstandingJobs,
/* methods */
setPrivateQueueEnabled,
};
Expand All @@ -37,6 +52,13 @@ export default defineComponent({

<template>
<v-container :fluid="$vuetify.breakpoint.mdAndDown">
<v-alert
v-if="outstandingJobs"
type="warning"
>
There are {{ outstandingJobs }} jobs currently in the job queue (including yours).
Jobs will be processed in the order in which they are received.
</v-alert>
<GirderJobList>
<template #jobwidget="{ item }">
<v-tooltip
Expand Down
3 changes: 2 additions & 1 deletion server/dive_server/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from .views_annotation import AnnotationResource
from .views_configuration import ConfigurationResource
from .views_dataset import DatasetResource
from .views_override import use_private_queue
from .views_override import countJobs, use_private_queue
from .views_rpc import RpcResource


Expand All @@ -33,6 +33,7 @@ def load(self, info):
info["apiRoot"].dive_rpc = RpcResource("dive_rpc")

# Setup route additions for exsting resources
info['apiRoot'].job.route("GET", ("queued",), countJobs)
info["apiRoot"].user.route("PUT", (":id", "use_private_queue"), use_private_queue)
User().exposeFields(AccessType.READ, constants.UserPrivateQueueEnabledMarker)

Expand Down
30 changes: 30 additions & 0 deletions server/dive_server/views_override.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
from girder.api.rest import boundHandler
from girder.constants import AccessType
from girder.models.user import User
from girder_jobs.models import job
from girder_worker.utils import JobStatus

from dive_utils import constants

Expand All @@ -30,3 +32,31 @@ def use_private_queue(self, user: dict, privateQueueEnabled: bool):
constants.UserPrivateQueueEnabledMarker, False
),
}


@access.user
@boundHandler
@autoDescribeRoute(Description('Get number of outstanding jobs'))
def countJobs(self):
outstanding = (
job.Job()
.list(
user='all',
currentUser=self.getCurrentUser(),
statuses=[
JobStatus.INACTIVE,
JobStatus.QUEUED,
JobStatus.RUNNING,
JobStatus.CANCELING,
JobStatus.CONVERTING_INPUT,
JobStatus.CONVERTING_OUTPUT,
JobStatus.FETCHING_INPUT,
JobStatus.PUSHING_OUTPUT,
],
)
.count()
)

return {
'outstanding': outstanding,
}