From: Michal Rakowski <michal.rakowski@baculasystems.com>
Date: Wed, 17 Nov 2021 11:42:44 +0000 (+0100)
Subject: Tweak Status table to be in-sync with all Job statuses possible
X-Git-Tag: Beta-15.0.0~762
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9223755b77a368e61e4c465a92df9063844ae55;p=thirdparty%2Fbacula.git

Tweak Status table to be in-sync with all Job statuses possible
---

diff --git a/bacula/src/cats/make_mysql_tables.in b/bacula/src/cats/make_mysql_tables.in
index 6c2ae14d5..3b484109b 100644
--- a/bacula/src/cats/make_mysql_tables.in
+++ b/bacula/src/cats/make_mysql_tables.in
@@ -546,6 +546,8 @@ INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
    ('A', 'Canceled by user',90),
    ('F', 'Waiting for Client',15),
    ('S', 'Waiting for Storage daemon',15),
+   ('l', 'Doing data despooling',15),
+   ('L', 'Committing data (last despool)',15),
    ('m', 'Waiting for new media',15),
    ('M', 'Waiting for media mount',15),
    ('s', 'Waiting for storage resource',15),
@@ -556,7 +558,11 @@ INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
    ('p', 'Waiting on higher priority jobs',15),
    ('i', 'Doing batch insert file records',15),
    ('I', 'Incomplete Job',25),
-   ('a', 'SD despooling attributes',15);
+   ('a', 'SD despooling attributes',15),
+   ('u', 'Cloud upload',15),
+   ('w', 'Cloud download',15),
+   ('q', 'Queued waiting for device',15),
+   ('W', 'Terminated normally with warnings',25);
 
 CREATE TABLE PathHierarchy
 (
diff --git a/bacula/src/cats/make_postgresql_tables.in b/bacula/src/cats/make_postgresql_tables.in
index 5be98e80e..283aa80fb 100644
--- a/bacula/src/cats/make_postgresql_tables.in
+++ b/bacula/src/cats/make_postgresql_tables.in
@@ -590,6 +590,10 @@ INSERT INTO Status (JobStatus,JobStatusLong) VALUES
    ('m', 'Waiting for new media');
 INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
    ('M', 'Waiting for media mount',15);
+INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
+   ('l', 'Doing data despooling',15);
+INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
+   ('L', 'Committing data (last despool)',15);
 INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
    ('s', 'Waiting for storage resource',15);
 INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
@@ -600,14 +604,22 @@ INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
    ('d', 'Waiting on maximum jobs',15);
 INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
    ('t', 'Waiting on start time',15);
+INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
+   ('u', 'Cloud upload',15);
+INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
+   ('w', 'Cloud download',15);
 INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
    ('p', 'Waiting on higher priority jobs',15);
+INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
+   ('q', 'Queued waiting for device',15);
 INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
    ('a', 'SD despooling attributes',15);
 INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
    ('i', 'Doing batch insert file records',15);
 INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
    ('I', 'Incomplete Job',25);
+INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
+   ('W', 'Terminated normally with warnings',25);
 
 CREATE TABLE Snapshot (
   SnapshotId	  serial,
diff --git a/bacula/src/cats/make_sqlite3_tables.in b/bacula/src/cats/make_sqlite3_tables.in
index 9bc560f1f..4b3a9b4ba 100644
--- a/bacula/src/cats/make_sqlite3_tables.in
+++ b/bacula/src/cats/make_sqlite3_tables.in
@@ -585,6 +585,10 @@ INSERT INTO Status (JobStatus,JobStatusLong) VALUES
    ('m', 'Waiting for new media');
 INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
    ('M', 'Waiting for media mount',15);
+INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
+   ('l', 'Doing data despooling',15);
+INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
+   ('L', 'Committing data (last despool)',15);
 INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
    ('s', 'Waiting for storage resource',15);
 INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
@@ -595,14 +599,22 @@ INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
    ('d', 'Waiting on maximum jobs',15);
 INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
    ('t', 'Waiting on start time',15);
+INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
+   ('u', 'Cloud upload',15);
+INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
+   ('w', 'Cloud download',15);
 INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
    ('p', 'Waiting on higher priority jobs',15);
+INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
+   ('q', 'Queued waiting for device',15);
 INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
    ('a', 'SD despooling attributes',15);
 INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
    ('i', 'Doing batch insert file records',15);
 INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
    ('I', 'Incomplete Job',25);
+INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
+   ('W', 'Terminated normally with warnings',25);
 
 -- Initialize Version		 
 INSERT INTO Version (VersionId) VALUES (1025);
diff --git a/bacula/src/cats/update_mysql_tables.in b/bacula/src/cats/update_mysql_tables.in
index 412ef92ff..56a08f694 100644
--- a/bacula/src/cats/update_mysql_tables.in
+++ b/bacula/src/cats/update_mysql_tables.in
@@ -620,6 +620,14 @@ CREATE INDEX meta_attachmentowner ON MetaAttachment (AttachmentTenant,Attachment
 CREATE INDEX meta_attachmentemailid ON MetaAttachment (AttachmentEmailId);
 CREATE INDEX meta_attachmentjobid on MetaAttachment (Jobid);
 
+INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
+   ('l', 'Doing data despooling',15),
+   ('L', 'Committing data (last despool)',15),
+   ('u', 'Cloud upload',15),
+   ('w', 'Cloud download',15),
+   ('q', 'Queued waiting for device',15),
+   ('W', 'Terminated normally with warnings',25);
+
 UPDATE Version SET VersionId=1025;
 END-OF-DATA
     then
diff --git a/bacula/src/cats/update_postgresql_tables.in b/bacula/src/cats/update_postgresql_tables.in
index 60c96b536..55e74dacd 100644
--- a/bacula/src/cats/update_postgresql_tables.in
+++ b/bacula/src/cats/update_postgresql_tables.in
@@ -683,7 +683,20 @@ CREATE TABLE MetaAttachment
 
 CREATE INDEX meta_attachmentowner ON MetaAttachment (AttachmentTenant,AttachmentOwner);
 CREATE INDEX meta_attachmentemailid ON MetaAttachment (AttachmentEmailId);
-CREATE INDEX meta_attachmentjobid ON MetaAttachment (JobId); 
+CREATE INDEX meta_attachmentjobid ON MetaAttachment (JobId);
+
+INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
+   ('l', 'Doing data despooling',15);
+INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
+   ('L', 'Committing data (last despool)',15);
+INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
+   ('u', 'Cloud upload',15);
+INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
+   ('w', 'Cloud download',15);
+INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
+   ('q', 'Queued waiting for device',15);
+INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
+   ('W', 'Terminated normally with warnings',25);
 
 UPDATE Version SET VersionId=1025;
 commit;
diff --git a/bacula/updatedb/update_mysql_tables_1024_to_1025.in b/bacula/updatedb/update_mysql_tables_1024_to_1025.in
index 2dbada50d..f3392043c 100644
--- a/bacula/updatedb/update_mysql_tables_1024_to_1025.in
+++ b/bacula/updatedb/update_mysql_tables_1024_to_1025.in
@@ -83,7 +83,15 @@ CREATE INDEX meta_attachmentowner ON MetaAttachment (AttachmentTenant,Attachment
 CREATE INDEX meta_attachmentemailid ON MetaAttachment (AttachmentEmailId);
 CREATE INDEX meta_attachmentjobid on MetaAttachment (Jobid);
 
-UPDATE Version SET VersionId=1024;
+INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
+   ('l', 'Doing data despooling',15),
+   ('L', 'Committing data (last despool)',15),
+   ('u', 'Cloud upload',15),
+   ('w', 'Cloud download',15),
+   ('q', 'Queued waiting for device',15),
+   ('W', 'Terminated normally with warnings',25);
+
+UPDATE Version SET VersionId=1025;
 END-OF-DATA
 then
    echo "Update of Bacula MySQL tables 1024 to 1025 succeeded."
diff --git a/bacula/updatedb/update_postgresql_tables_1024_to_1025.in b/bacula/updatedb/update_postgresql_tables_1024_to_1025.in
index 740735dfe..e64bd4cb7 100644
--- a/bacula/updatedb/update_postgresql_tables_1024_to_1025.in
+++ b/bacula/updatedb/update_postgresql_tables_1024_to_1025.in
@@ -95,6 +95,20 @@ CREATE TABLE MetaAttachment
 CREATE INDEX meta_attachmentowner ON MetaAttachment (AttachmentTenant,AttachmentOwner);
 CREATE INDEX meta_attachmentemailid ON MetaAttachment (AttachmentEmailId);
 CREATE INDEX meta_attachmentjobid ON MetaAttachment (JobId); 
+
+INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
+   ('l', 'Doing data despooling',15);
+INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
+   ('L', 'Committing data (last despool)',15);
+INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
+   ('u', 'Cloud upload',15);
+INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
+   ('w', 'Cloud download',15);
+INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
+   ('q', 'Queued waiting for device',15);
+INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
+   ('W', 'Terminated normally with warnings',25);
+
 UPDATE Version SET VersionId=1025;
 commit;
 END-OF-DATA