From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dcsapak@zita.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 91B7D6A0C5
for <pbs-devel@lists.proxmox.com>; Tue, 11 Aug 2020 11:57:29 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 8ECEF1BCB5
for <pbs-devel@lists.proxmox.com>; Tue, 11 Aug 2020 11:57:29 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[212.186.127.180])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id C5A0C1BC62
for <pbs-devel@lists.proxmox.com>; Tue, 11 Aug 2020 11:57:25 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 7D1264459C
for <pbs-devel@lists.proxmox.com>; Tue, 11 Aug 2020 11:57:25 +0200 (CEST)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Date: Tue, 11 Aug 2020 11:57:15 +0200
Message-Id: <20200811095724.26896-1-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.20.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.047 Adjusted score from AWL reputation of From: address
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery
methods
NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records
RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/,
medium trust
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_NONE 0.001 SPF: sender does not publish an SPF Record
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [config.rs, pull.rs, jobstate.rs, tasks.rs, mod.rs,
proxmox-backup-api.rs, sync.rs, proxmox-backup-proxy.rs]
Subject: [pbs-devel] [PATCH proxmox-backup v2 0/9] improve syncjob handling
X-BeenThere: pbs-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Backup Server development discussion
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Tue, 11 Aug 2020 09:57:29 -0000
by saving the state in a separate file instead of parsing the task log
should be faster and more correct, since we cannot phase out
the last sync if too many tasks are started
we have to do the same for all other tasks that can be scheduled
changes from v1:
* rebase on master (new Userid struct)
* use an enum instead of a struct for jobstate since it
better represents what we want
(this way we do not have to save the starttime twice for example)
* add an enum for TaskState and use that (instead of strings)
(by doing this we can better parse the state for the syncview)
* incorporate dietmar suggestsions
* refactor do_sync_job first and extend after that
* improve the state display in the gui
* make some columsn smaller in the gui
Dominik Csapak (9):
server: change status of a task from a string to an enum
config: add JobState helper
api/{pull,sync}: refactor to do_sync_job
api2/pull: extend do_sync_job to also handle schedule and jobstate
syncjob: use do_sync_job also for scheduled sync jobs
syncjob: use JobState for determining when to run next scheduled sync
api2/admin/sync: use JobState for faster access to state info
ui: syncjob: improve task text rendering
ui: syncjob: make some columns smaller
src/api2/admin/sync.rs | 72 ++++++------------
src/api2/config/sync.rs | 2 +
src/api2/node/tasks.rs | 8 +-
src/api2/pull.rs | 70 ++++++++++++++++++
src/api2/types/mod.rs | 2 +-
src/bin/proxmox-backup-api.rs | 1 +
src/bin/proxmox-backup-proxy.rs | 91 ++++++-----------------
src/config.rs | 1 +
src/config/jobstate.rs | 125 ++++++++++++++++++++++++++++++++
src/server/worker_task.rs | 88 +++++++++++++++++-----
www/config/SyncView.js | 30 ++++++--
11 files changed, 340 insertions(+), 150 deletions(-)
create mode 100644 src/config/jobstate.rs
--
2.20.1