From 1ed198920dd36c23df7e3eb94108d05a24398ee1 Mon Sep 17 00:00:00 2001 From: Marco van Wieringen Date: Thu, 15 Sep 2011 21:42:27 +0200 Subject: [PATCH] Lower acl and xattr message from M_ERROR to M_WARNING An restore or backup error of ACL or XATTR shouldn't set the backup status to error but warnings should be issues so the backup operator knows things are failing. --- bacula/src/filed/backup.c | 8 ++++---- bacula/src/filed/restore.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bacula/src/filed/backup.c b/bacula/src/filed/backup.c index 09de90ea8c..ebed5bb9a7 100644 --- a/bacula/src/filed/backup.c +++ b/bacula/src/filed/backup.c @@ -187,11 +187,11 @@ bool blast_data_to_storage_daemon(JCR *jcr, char *addr) } if (have_acl && jcr->acl_data->nr_errors > 0) { - Jmsg(jcr, M_ERROR, 0, _("Encountered %ld acl errors while doing backup\n"), + Jmsg(jcr, M_WARNING, 0, _("Encountered %ld acl errors while doing backup\n"), jcr->acl_data->nr_errors); } if (have_xattr && jcr->xattr_data->nr_errors > 0) { - Jmsg(jcr, M_ERROR, 0, _("Encountered %ld xattr errors while doing backup\n"), + Jmsg(jcr, M_WARNING, 0, _("Encountered %ld xattr errors while doing backup\n"), jcr->xattr_data->nr_errors); } @@ -675,7 +675,7 @@ int save_file(JCR *jcr, FF_PKT *ff_pkt, bool top_level) * print the error message set by the lower level routine in jcr->errmsg. */ if (jcr->acl_data->nr_errors < ACL_REPORT_ERR_MAX_PER_JOB) { - Jmsg(jcr, M_ERROR, 0, "%s", jcr->errmsg); + Jmsg(jcr, M_WARNING, 0, "%s", jcr->errmsg); } jcr->acl_data->nr_errors++; break; @@ -699,7 +699,7 @@ int save_file(JCR *jcr, FF_PKT *ff_pkt, bool top_level) * print the error message set by the lower level routine in jcr->errmsg. */ if (jcr->xattr_data->nr_errors < XATTR_REPORT_ERR_MAX_PER_JOB) { - Jmsg(jcr, M_ERROR, 0, "%s", jcr->errmsg); + Jmsg(jcr, M_WARNING, 0, "%s", jcr->errmsg); } jcr->xattr_data->nr_errors++; break; diff --git a/bacula/src/filed/restore.c b/bacula/src/filed/restore.c index 8b3ef7dfb7..3fb87eab9f 100644 --- a/bacula/src/filed/restore.c +++ b/bacula/src/filed/restore.c @@ -833,15 +833,15 @@ ok_out: Dmsg2(10, "End Do Restore. Files=%d Bytes=%s\n", jcr->JobFiles, edit_uint64(jcr->JobBytes, ec1)); if (have_acl && jcr->acl_data->nr_errors > 0) { - Jmsg(jcr, M_ERROR, 0, _("Encountered %ld acl errors while doing restore\n"), + Jmsg(jcr, M_WARNING, 0, _("Encountered %ld acl errors while doing restore\n"), jcr->acl_data->nr_errors); } if (have_xattr && jcr->xattr_data->nr_errors > 0) { - Jmsg(jcr, M_ERROR, 0, _("Encountered %ld xattr errors while doing restore\n"), + Jmsg(jcr, M_WARNING, 0, _("Encountered %ld xattr errors while doing restore\n"), jcr->xattr_data->nr_errors); } if (non_support_data > 1 || non_support_attr > 1) { - Jmsg(jcr, M_ERROR, 0, _("%d non-supported data streams and %d non-supported attrib streams ignored.\n"), + Jmsg(jcr, M_WARNING, 0, _("%d non-supported data streams and %d non-supported attrib streams ignored.\n"), non_support_data, non_support_attr); } if (non_support_rsrc) { -- 2.39.5