mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-10-29 21:55:25 +03:00
import: minor cleanups for the tar and raw importers
This commit is contained in:
parent
91ca5bf0b6
commit
8b71fce8c2
@ -84,7 +84,13 @@ RawImport* raw_import_unref(RawImport *i) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
int raw_import_new(RawImport **ret, sd_event *event, const char *image_root, RawImportFinished on_finished, void *userdata) {
|
||||
int raw_import_new(
|
||||
RawImport **ret,
|
||||
sd_event *event,
|
||||
const char *image_root,
|
||||
RawImportFinished on_finished,
|
||||
void *userdata) {
|
||||
|
||||
_cleanup_(raw_import_unrefp) RawImport *i = NULL;
|
||||
int r;
|
||||
|
||||
@ -249,6 +255,20 @@ static int raw_import_make_local_copy(RawImport *i) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
static bool raw_import_is_done(RawImport *i) {
|
||||
assert(i);
|
||||
assert(i->raw_job);
|
||||
|
||||
if (i->raw_job->state != IMPORT_JOB_DONE)
|
||||
return false;
|
||||
if (i->checksum_job && i->checksum_job->state != IMPORT_JOB_DONE)
|
||||
return false;
|
||||
if (i->signature_job && i->signature_job->state != IMPORT_JOB_DONE)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static void raw_import_job_on_finished(ImportJob *j) {
|
||||
RawImport *i;
|
||||
int r;
|
||||
@ -276,11 +296,7 @@ static void raw_import_job_on_finished(ImportJob *j) {
|
||||
*
|
||||
* We only do something when we got all three files */
|
||||
|
||||
if (i->raw_job->state != IMPORT_JOB_DONE)
|
||||
return;
|
||||
if (i->checksum_job && i->checksum_job->state != IMPORT_JOB_DONE)
|
||||
return;
|
||||
if (i->signature_job && i->signature_job->state != IMPORT_JOB_DONE)
|
||||
if (!raw_import_is_done(i))
|
||||
return;
|
||||
|
||||
if (!i->raw_job->etag_exists) {
|
||||
@ -330,6 +346,9 @@ static int raw_import_job_on_open_disk(ImportJob *j) {
|
||||
assert(j->userdata);
|
||||
|
||||
i = j->userdata;
|
||||
assert(i->raw_job == j);
|
||||
assert(!i->final_path);
|
||||
assert(!i->temp_path);
|
||||
|
||||
r = import_make_path(j->url, j->etag, i->image_root, ".raw-", ".raw", &i->final_path);
|
||||
if (r < 0)
|
||||
@ -359,15 +378,15 @@ int raw_import_pull(RawImport *i, const char *url, const char *local, bool force
|
||||
assert(verify < _IMPORT_VERIFY_MAX);
|
||||
assert(verify >= 0);
|
||||
|
||||
if (i->raw_job)
|
||||
return -EBUSY;
|
||||
|
||||
if (!http_url_is_valid(url))
|
||||
return -EINVAL;
|
||||
|
||||
if (local && !machine_name_is_valid(local))
|
||||
return -EINVAL;
|
||||
|
||||
if (i->raw_job)
|
||||
return -EBUSY;
|
||||
|
||||
r = free_and_strdup(&i->local, local);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
@ -63,7 +63,7 @@ TarImport* tar_import_unref(TarImport *i) {
|
||||
return NULL;
|
||||
|
||||
if (i->tar_pid > 1) {
|
||||
(void) kill(i->tar_pid, SIGKILL);
|
||||
(void) kill_and_sigcont(i->tar_pid, SIGKILL);
|
||||
(void) wait_for_terminate(i->tar_pid, NULL);
|
||||
}
|
||||
|
||||
@ -88,7 +88,13 @@ TarImport* tar_import_unref(TarImport *i) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
int tar_import_new(TarImport **ret, sd_event *event, const char *image_root, TarImportFinished on_finished, void *userdata) {
|
||||
int tar_import_new(
|
||||
TarImport **ret,
|
||||
sd_event *event,
|
||||
const char *image_root,
|
||||
TarImportFinished on_finished,
|
||||
void *userdata) {
|
||||
|
||||
_cleanup_(tar_import_unrefp) TarImport *i = NULL;
|
||||
int r;
|
||||
|
||||
@ -149,6 +155,20 @@ static int tar_import_make_local_copy(TarImport *i) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
static bool tar_import_is_done(TarImport *i) {
|
||||
assert(i);
|
||||
assert(i->tar_job);
|
||||
|
||||
if (i->tar_job->state != IMPORT_JOB_DONE)
|
||||
return false;
|
||||
if (i->checksum_job && i->checksum_job->state != IMPORT_JOB_DONE)
|
||||
return false;
|
||||
if (i->signature_job && i->signature_job->state != IMPORT_JOB_DONE)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static void tar_import_job_on_finished(ImportJob *j) {
|
||||
TarImport *i;
|
||||
int r;
|
||||
@ -173,11 +193,7 @@ static void tar_import_job_on_finished(ImportJob *j) {
|
||||
* successfully, or the download was skipped because we
|
||||
* already have the etag. */
|
||||
|
||||
if (i->tar_job->state != IMPORT_JOB_DONE)
|
||||
return;
|
||||
if (i->checksum_job && i->checksum_job->state != IMPORT_JOB_DONE)
|
||||
return;
|
||||
if (i->signature_job && i->signature_job->state != IMPORT_JOB_DONE)
|
||||
if (!tar_import_is_done(i))
|
||||
return;
|
||||
|
||||
j->disk_fd = safe_close(i->tar_job->disk_fd);
|
||||
@ -231,6 +247,10 @@ static int tar_import_job_on_open_disk(ImportJob *j) {
|
||||
assert(j->userdata);
|
||||
|
||||
i = j->userdata;
|
||||
assert(i->tar_job == j);
|
||||
assert(!i->final_path);
|
||||
assert(!i->temp_path);
|
||||
assert(i->tar_pid <= 0);
|
||||
|
||||
r = import_make_path(j->url, j->etag, i->image_root, ".tar-", NULL, &i->final_path);
|
||||
if (r < 0)
|
||||
@ -306,15 +326,15 @@ int tar_import_pull(TarImport *i, const char *url, const char *local, bool force
|
||||
|
||||
assert(i);
|
||||
|
||||
if (i->tar_job)
|
||||
return -EBUSY;
|
||||
|
||||
if (!http_url_is_valid(url))
|
||||
return -EINVAL;
|
||||
|
||||
if (local && !machine_name_is_valid(local))
|
||||
return -EINVAL;
|
||||
|
||||
if (i->tar_job)
|
||||
return -EBUSY;
|
||||
|
||||
r = free_and_strdup(&i->local, local);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
Loading…
Reference in New Issue
Block a user