Merge pull request #48 from PanDAWMS/eddiedev

Add ERROR_DIAG column to JEDI_EVENTS table
PanDAWMS · Jun 28, 2023 · 3cf2b0a · 3cf2b0a
2 parents 03944b6 + 78e06dd
commit 3cf2b0a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/schema/oracle/ATLAS_PANDA.sql b/schema/oracle/ATLAS_PANDA.sql
@@ -745,7 +745,8 @@ CREATE TABLE "ATLAS_PANDA"."JEDI_DATASET_LOCALITY"
 	"ZIPROW_ID" NUMBER(11,0), 
 	"FILE_NOT_DELETED" CHAR(1 BYTE), 
 	"ERROR_CODE" NUMBER(5,0), 
-	"PATH_CONVENTION" NUMBER(2,0), 
+	"PATH_CONVENTION" NUMBER(2,0),
+	"ERROR_DIAG" VARCHAR2(500 BYTE),
 	 CONSTRAINT "JEDI_EVENTS_PK" PRIMARY KEY ("JEDITASKID", "PANDAID", "FILEID", "JOB_PROCESSID") ENABLE
    ) ORGANIZATION INDEX COMPRESS 1 
   PARTITION BY RANGE ("JEDITASKID") 
@@ -767,6 +768,7 @@ CREATE TABLE "ATLAS_PANDA"."JEDI_DATASET_LOCALITY"
    COMMENT ON COLUMN "ATLAS_PANDA"."JEDI_EVENTS"."FILE_NOT_DELETED" IS 'Flag whether the file has been deleted by Rucio. The flag is set to ''Y'' by the PanDA server for "status IN (4,5,7,8) AND objstore_id IS NOT NULL" condition. Rucio sets it back to NULL after handling it.';
    COMMENT ON COLUMN "ATLAS_PANDA"."JEDI_EVENTS"."ERROR_CODE" IS 'Error code for the event range';
    COMMENT ON COLUMN "ATLAS_PANDA"."JEDI_EVENTS"."PATH_CONVENTION" IS 'Convention ID of file path. This is required to use various conventions for file paths in object stores.';
+   COMMENT ON COLUMN "ATLAS_PANDA"."JEDI_EVENTS"."ERROR_DIAG" IS 'To track the error message for Vera Rubin jobs.';
 
 --------------------------------------------------------
 --  DDL for Table JEDI_JOBPARAMS_TEMPLATE

diff --git a/schema/oracle/patches/next_version.patch.sql b/schema/oracle/patches/next_version.patch.sql
@@ -0,0 +1,3 @@
+-- patches to be included in the next version
+
+ALTER TABLE "DOMA_PANDA"."JEDI_EVENTS" ADD ("ERROR_DIAG" VARCHAR2(500 BYTE));
diff --git a/schema/postgres/sqls/patches/next_version.patch.sql b/schema/postgres/sqls/patches/next_version.patch.sql
@@ -13,3 +13,7 @@ retention = '7 days',
 retention_keep_table = false
 WHERE parent_table = 'doma_panda.pandalog'
 ;
+
+ALTER TABLE doma_panda.jedi_events
+    error_diag varchar(500)
+;
diff --git a/schema/postgres/sqls/pg_PANDA_TABLE.sql b/schema/postgres/sqls/pg_PANDA_TABLE.sql
@@ -707,7 +707,8 @@ CREATE TABLE jedi_events (
 	ziprow_id bigint,
 	file_not_deleted char(1),
 	error_code integer,
-	path_convention smallint
+	path_convention smallint,
+	error_diag varchar(500),
 ) PARTITION BY RANGE (jeditaskid) ;
 COMMENT ON COLUMN jedi_events.attemptnr IS E'How many times the events have been retried so far';
 COMMENT ON COLUMN jedi_events.datasetid IS E'DatasetID of the file which contains the events';
@@ -725,6 +726,7 @@ COMMENT ON COLUMN jedi_events.path_convention IS E'Convention ID of file path. T
 COMMENT ON COLUMN jedi_events.processed_upto_eventid IS E'The event number which the slave process completed so far';
 COMMENT ON COLUMN jedi_events.status IS E'The status of the event range';
 COMMENT ON COLUMN jedi_events.ziprow_id IS E'ROW_ID of the zip file in the file table (FILESTABLE4). NULL if not zipped';
+COMMENT ON COLUMN jedi_events.error_diag IS E'To track the error message for Vera Rubin jobs.';
 ALTER  TABLE jedi_events OWNER TO panda;
 CREATE INDEX jedi_events_fileid_idx ON jedi_events (fileid);
 CREATE INDEX jedi_events_file_notdel_idx ON jedi_events (file_not_deleted);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		-- patches to be included in the next version

		ALTER TABLE "DOMA_PANDA"."JEDI_EVENTS" ADD ("ERROR_DIAG" VARCHAR2(500 BYTE));