job: Add query-jobs QMP command
This adds a minimal query-jobs implementation that shouldn't pose many design questions. It can later be extended to expose more information, and especially job-specific information. Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
1a90bc8128
commit
456273b024
@ -392,6 +392,9 @@ JobType job_type(const Job *job);
|
|||||||
/** Returns the enum string for the JobType of a given Job. */
|
/** Returns the enum string for the JobType of a given Job. */
|
||||||
const char *job_type_str(const Job *job);
|
const char *job_type_str(const Job *job);
|
||||||
|
|
||||||
|
/** Returns true if the job should not be visible to the management layer. */
|
||||||
|
bool job_is_internal(Job *job);
|
||||||
|
|
||||||
/** Returns whether the job is scheduled for cancellation. */
|
/** Returns whether the job is scheduled for cancellation. */
|
||||||
bool job_is_cancelled(Job *job);
|
bool job_is_cancelled(Job *job);
|
||||||
|
|
||||||
|
54
job-qmp.c
54
job-qmp.c
@ -132,3 +132,57 @@ void qmp_job_dismiss(const char *id, Error **errp)
|
|||||||
job_dismiss(&job, errp);
|
job_dismiss(&job, errp);
|
||||||
aio_context_release(aio_context);
|
aio_context_release(aio_context);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static JobInfo *job_query_single(Job *job, Error **errp)
|
||||||
|
{
|
||||||
|
JobInfo *info;
|
||||||
|
const char *errmsg = NULL;
|
||||||
|
|
||||||
|
assert(!job_is_internal(job));
|
||||||
|
|
||||||
|
if (job->ret < 0) {
|
||||||
|
errmsg = strerror(-job->ret);
|
||||||
|
}
|
||||||
|
|
||||||
|
info = g_new(JobInfo, 1);
|
||||||
|
*info = (JobInfo) {
|
||||||
|
.id = g_strdup(job->id),
|
||||||
|
.type = job_type(job),
|
||||||
|
.status = job->status,
|
||||||
|
.current_progress = job->progress_current,
|
||||||
|
.total_progress = job->progress_total,
|
||||||
|
.has_error = !!errmsg,
|
||||||
|
.error = g_strdup(errmsg),
|
||||||
|
};
|
||||||
|
|
||||||
|
return info;
|
||||||
|
}
|
||||||
|
|
||||||
|
JobInfoList *qmp_query_jobs(Error **errp)
|
||||||
|
{
|
||||||
|
JobInfoList *head = NULL, **p_next = &head;
|
||||||
|
Job *job;
|
||||||
|
|
||||||
|
for (job = job_next(NULL); job; job = job_next(job)) {
|
||||||
|
JobInfoList *elem;
|
||||||
|
AioContext *aio_context;
|
||||||
|
|
||||||
|
if (job_is_internal(job)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
elem = g_new0(JobInfoList, 1);
|
||||||
|
aio_context = job->aio_context;
|
||||||
|
aio_context_acquire(aio_context);
|
||||||
|
elem->value = job_query_single(job, errp);
|
||||||
|
aio_context_release(aio_context);
|
||||||
|
if (!elem->value) {
|
||||||
|
g_free(elem);
|
||||||
|
qapi_free_JobInfoList(head);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
*p_next = elem;
|
||||||
|
p_next = &elem->next;
|
||||||
|
}
|
||||||
|
|
||||||
|
return head;
|
||||||
|
}
|
||||||
|
2
job.c
2
job.c
@ -158,7 +158,7 @@ static int job_txn_apply(JobTxn *txn, int fn(Job *), bool lock)
|
|||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool job_is_internal(Job *job)
|
bool job_is_internal(Job *job)
|
||||||
{
|
{
|
||||||
return (job->id == NULL);
|
return (job->id == NULL);
|
||||||
}
|
}
|
||||||
|
@ -205,3 +205,49 @@
|
|||||||
# Since: 2.13
|
# Since: 2.13
|
||||||
##
|
##
|
||||||
{ 'command': 'job-finalize', 'data': { 'id': 'str' } }
|
{ 'command': 'job-finalize', 'data': { 'id': 'str' } }
|
||||||
|
|
||||||
|
##
|
||||||
|
# @JobInfo:
|
||||||
|
#
|
||||||
|
# Information about a job.
|
||||||
|
#
|
||||||
|
# @id: The job identifier
|
||||||
|
#
|
||||||
|
# @type: The kind of job that is being performed
|
||||||
|
#
|
||||||
|
# @status: Current job state/status
|
||||||
|
#
|
||||||
|
# @current-progress: Progress made until now. The unit is arbitrary and the
|
||||||
|
# value can only meaningfully be used for the ratio of
|
||||||
|
# @current-progress to @total-progress. The value is
|
||||||
|
# monotonically increasing.
|
||||||
|
#
|
||||||
|
# @total-progress: Estimated @current-progress value at the completion of
|
||||||
|
# the job. This value can arbitrarily change while the
|
||||||
|
# job is running, in both directions.
|
||||||
|
#
|
||||||
|
# @error: If this field is present, the job failed; if it is
|
||||||
|
# still missing in the CONCLUDED state, this indicates
|
||||||
|
# successful completion.
|
||||||
|
#
|
||||||
|
# The value is a human-readable error message to describe
|
||||||
|
# the reason for the job failure. It should not be parsed
|
||||||
|
# by applications.
|
||||||
|
#
|
||||||
|
# Since: 2.13
|
||||||
|
##
|
||||||
|
{ 'struct': 'JobInfo',
|
||||||
|
'data': { 'id': 'str', 'type': 'JobType', 'status': 'JobStatus',
|
||||||
|
'current-progress': 'int', 'total-progress': 'int',
|
||||||
|
'*error': 'str' } }
|
||||||
|
|
||||||
|
##
|
||||||
|
# @query-jobs:
|
||||||
|
#
|
||||||
|
# Return information about jobs.
|
||||||
|
#
|
||||||
|
# Returns: a list with a @JobInfo for each active job
|
||||||
|
#
|
||||||
|
# Since: 2.13
|
||||||
|
##
|
||||||
|
{ 'command': 'query-jobs', 'returns': ['JobInfo'] }
|
||||||
|
Loading…
Reference in New Issue
Block a user