db5d2a4b77
where there is no good reason to keep them separate. It's a pain during rebase if there are multiple patches changing the same code over and over again. This was especially bad for the backup-related patches. If the history of patches really is needed, it can be extracted via git. Additionally, compilation with partial application of patches was broken since a long time, because one of the master key changes became part of an earlier patch during a past rebase. If only the same files were changed by a subsequent patch and the changes felt to belong together (obvious for later bug fixes, but also done for features e.g. adding master key support for PBS), the patches were squashed together. The PBS namespace support patch was split into the individual parts it changes, i.e. PBS block driver, pbs-restore binary and QMP backup infrastructure, and squashed into the respective patches. No code change is intended, git diff in the submodule should not show any difference between applying all patches before this commit and applying all patches after this commit. The query-proxmox-support QMP function has been left as part of the "PVE-Backup: Proxmox backup patches for QEMU" patch, because it's currently only used there. If it ever is used elsewhere too, it can be split out from there. The recent alloc-track and BQL-related savevm-async changes have been left separate for now, because it's not 100% clear they are the best approach yet. This depends on what upstream decides about the BQL stuff and whether and what kind of issues with the changes pop up. The qemu-img dd snapshot patch has been re-ordered to after the other qemu-img dd patches. Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
102 lines
2.9 KiB
Diff
102 lines
2.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Stefan Reiter <s.reiter@proxmox.com>
|
|
Date: Thu, 20 Aug 2020 14:31:59 +0200
|
|
Subject: [PATCH] PVE: Add sequential job transaction support
|
|
|
|
Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
---
|
|
include/qemu/job.h | 12 ++++++++++++
|
|
job.c | 34 ++++++++++++++++++++++++++++++++++
|
|
2 files changed, 46 insertions(+)
|
|
|
|
diff --git a/include/qemu/job.h b/include/qemu/job.h
|
|
index e502787dd8..963cf2bef5 100644
|
|
--- a/include/qemu/job.h
|
|
+++ b/include/qemu/job.h
|
|
@@ -381,6 +381,18 @@ void job_unlock(void);
|
|
*/
|
|
JobTxn *job_txn_new(void);
|
|
|
|
+/**
|
|
+ * Create a new transaction and set it to sequential mode, i.e. run all jobs
|
|
+ * one after the other instead of at the same time.
|
|
+ */
|
|
+JobTxn *job_txn_new_seq(void);
|
|
+
|
|
+/**
|
|
+ * Helper method to start the first job in a sequential transaction to kick it
|
|
+ * off. Other jobs will be run after this one completes.
|
|
+ */
|
|
+void job_txn_start_seq(JobTxn *txn);
|
|
+
|
|
/**
|
|
* Release a reference that was previously acquired with job_txn_add_job or
|
|
* job_txn_new. If it's the last reference to the object, it will be freed.
|
|
diff --git a/job.c b/job.c
|
|
index 93e22d180b..2b31f1e14f 100644
|
|
--- a/job.c
|
|
+++ b/job.c
|
|
@@ -93,6 +93,8 @@ struct JobTxn {
|
|
|
|
/* Reference count */
|
|
int refcnt;
|
|
+
|
|
+ bool sequential;
|
|
};
|
|
|
|
void job_lock(void)
|
|
@@ -118,6 +120,25 @@ JobTxn *job_txn_new(void)
|
|
return txn;
|
|
}
|
|
|
|
+JobTxn *job_txn_new_seq(void)
|
|
+{
|
|
+ JobTxn *txn = job_txn_new();
|
|
+ txn->sequential = true;
|
|
+ return txn;
|
|
+}
|
|
+
|
|
+void job_txn_start_seq(JobTxn *txn)
|
|
+{
|
|
+ assert(txn->sequential);
|
|
+ assert(!txn->aborting);
|
|
+
|
|
+ Job *first = QLIST_FIRST(&txn->jobs);
|
|
+ assert(first);
|
|
+ assert(first->status == JOB_STATUS_CREATED);
|
|
+
|
|
+ job_start(first);
|
|
+}
|
|
+
|
|
/* Called with job_mutex held. */
|
|
static void job_txn_ref_locked(JobTxn *txn)
|
|
{
|
|
@@ -1057,6 +1078,12 @@ static void job_completed_txn_success_locked(Job *job)
|
|
*/
|
|
QLIST_FOREACH(other_job, &txn->jobs, txn_list) {
|
|
if (!job_is_completed_locked(other_job)) {
|
|
+ if (txn->sequential) {
|
|
+ job_unlock();
|
|
+ /* Needs to be called without holding the job lock */
|
|
+ job_start(other_job);
|
|
+ job_lock();
|
|
+ }
|
|
return;
|
|
}
|
|
assert(other_job->ret == 0);
|
|
@@ -1268,6 +1295,13 @@ int job_finish_sync_locked(Job *job,
|
|
return -EBUSY;
|
|
}
|
|
|
|
+ /* in a sequential transaction jobs with status CREATED can appear at time
|
|
+ * of cancelling, these have not begun work so job_enter won't do anything,
|
|
+ * let's ensure they are marked as ABORTING if required */
|
|
+ if (job->status == JOB_STATUS_CREATED && job->txn->sequential) {
|
|
+ job_update_rc_locked(job);
|
|
+ }
|
|
+
|
|
job_unlock();
|
|
AIO_WAIT_WHILE_UNLOCKED(job->aio_context,
|
|
(job_enter(job), !job_is_completed(job)));
|