Merge pull request #113 from PanDAWMS/v0.0.30

v0.0.30

Author: EdwardKaravakis

schema/oracle/ATLAS_PANDA.sql

@@ -34,9 +34,7 @@
 --  IMPORTANT: Please always update to up2date version
 --------------------------------------------------------
 
-  INSERT INTO "ATLAS_PANDA"."PANDADB_VERSION" VALUES ('SERVER', 0, 0, 29);
-  INSERT INTO "ATLAS_PANDA"."PANDADB_VERSION" VALUES ('JEDI', 0, 0, 29);
-
+  INSERT INTO "ATLAS_PANDA"."PANDADB_VERSION" VALUES ('PanDA', 0, 0, 30);
  --------------------------------------------------------
 --  DDL for Sequence FILESTABLE4_ROW_ID_SEQ
 --------------------------------------------------------
@@ -936,7 +934,7 @@ CREATE TABLE "ATLAS_PANDA"."GLOBAL_SHARES_AUDIT"
 	"WORKQUEUE_ID" NUMBER(5,0), 
 	"PROGRESS" NUMBER(3,0), 
 	"FAILURERATE" NUMBER(3,0), 
-	"ERRORDIALOG" VARCHAR2(255 BYTE), 
+	"ERRORDIALOG" VARCHAR2(510 BYTE),
 	"COUNTRYGROUP" VARCHAR2(20 BYTE), 
 	"PARENT_TID" NUMBER(12,0), 
 	"EVENTSERVICE" NUMBER(1,0), 
@@ -5056,7 +5054,7 @@ BEGIN
                       JOIN ATLAS_PANDA.JEDI_Events PARTITION ('||p.PARTITION_NAME||') e 
                       ON (t.JEDITASKID = e.JEDITASKID)
                       WHERE t.STATUS IN (''done'', ''finished'', ''aborted'', ''failed'', ''broken'') 
-                      AND t.MODIFICATIONTIME < sysdate - 90' into taskid_cnt;
+                      AND t.MODIFICATIONTIME < sysdate - 30' into taskid_cnt;
 
     if (rows_cnt = taskid_cnt and rows_cnt <> 0) then
       --dbms_output.put_line('ALTER TABLE ATLAS_PANDA.JEDI_Events DROP PARTITION '||p.PARTITION_NAME||' update global indexes;');

schema/postgres/panda_db_init.sh

@@ -22,7 +22,7 @@ echo
 
 # check schema version
 LATEST_VERSION=$(cat ${DIR}/version)
-CURRENT_VERSION=$(psql -d panda_db -U postgres -tc "SELECT major || '.' ||  minor || '.' || patch FROM doma_panda.pandadb_version WHERE component = 'SERVER'" || true)
+CURRENT_VERSION=$(psql -d panda_db -U postgres -tc "SELECT major || '.' ||  minor || '.' || patch FROM doma_panda.pandadb_version WHERE component = 'PanDA'" || true)
 
 IFS='.' read -r MAJOR MINOR PATCH <<< "$LATEST_VERSION"
 
@@ -45,8 +45,7 @@ else
         fi
     done
     # update version
-    psql -d panda_db -U postgres -c "UPDATE doma_panda.pandadb_version set major='${MAJOR}', minor='${MINOR}', patch='${PATCH}' WHERE component = 'SERVER'"
-    psql -d panda_db -U postgres -c "UPDATE doma_panda.pandadb_version set major='${MAJOR}', minor='${MINOR}', patch='${PATCH}' WHERE component = 'JEDI'"
+    psql -d panda_db -U postgres -c "UPDATE doma_panda.pandadb_version set major='${MAJOR}', minor='${MINOR}', patch='${PATCH}' WHERE component = 'PanDA'"
     echo ========== updated to the latest schema "$LATEST_VERSION"
     exit 0
 fi
@@ -72,9 +71,7 @@ do
 done
 
 echo ========== adding the schema version "$LATEST_VERSION"
-psql -d panda_db -U postgres -c "INSERT INTO doma_panda.pandadb_version (component, major, minor, patch) VALUES('SERVER', '${MAJOR}', '${MINOR}', '${PATCH}')"
-psql -d panda_db -U postgres -c "INSERT INTO doma_panda.pandadb_version (component, major, minor, patch) VALUES('JEDI', '${MAJOR}', '${MINOR}', '${PATCH}')"
-
+psql -d panda_db -U postgres -c "INSERT INTO doma_panda.pandadb_version (component, major, minor, patch) VALUES('PanDA', '${MAJOR}', '${MINOR}', '${PATCH}')"
 
 echo ========== post step
 psql -U postgres -d panda_db -f $DIR/post_step_panda.sql

schema/postgres/sqls/patches/0.0.30.patch.sql

@@ -1,4 +1,47 @@
 -- patch to be used to upgrade from version 0.0.29
+ALTER TABLE doma_panda.jeditasks
+  ALTER COLUMN errordialog VARCHAR(510);
+
+CREATE OR REPLACE PROCEDURE doma_panda.delete_jedi_events_proc () AS $body$
+DECLARE
+
+  rows_cnt bigint;
+  taskid_cnt bigint;
+  --row_sum bigint := 0;
+  --part_cnt bigint := 1;
+  p RECORD;
+
+BEGIN
+  EXECUTE 'alter session set ddl_lock_timeout=30';
+
+  for p in (select PARTITION_NAME from user_tab_partitions where table_name = 'JEDI_EVENTS') loop
+
+    EXECUTE 'SELECT COUNT(*) FROM doma_panda.JEDI_Events PARTITION ('||p.PARTITION_NAME||')' into STRICT rows_cnt;
+
+    EXECUTE 'SELECT COUNT(*)
+                      FROM doma_panda.JEDI_Tasks t
+                      JOIN doma_panda.JEDI_Events PARTITION ('||p.PARTITION_NAME||') e
+                      ON (t.JEDITASKID = e.JEDITASKID)
+                      WHERE t.STATUS IN (''done'', ''finished'', ''aborted'', ''failed'', ''broken'')
+                      AND t.MODIFICATIONTIME < sysdate - 30' into STRICT taskid_cnt;
+
+    if (rows_cnt = taskid_cnt and rows_cnt <> 0) then
+      --dbms_output.put_line('ALTER TABLE doma_panda.JEDI_Events DROP PARTITION '||p.PARTITION_NAME||' update global indexes;');
+      EXECUTE 'ALTER TABLE doma_panda.JEDI_Events DROP PARTITION '||p.PARTITION_NAME;
+      --dbms_output.put_line(part_cnt||' '||p.PARTITION_NAME||' >>> '||rows_cnt);
+      --row_sum := row_sum + taskid_cnt;
+      --part_cnt := part_cnt + 1;
+    end if;
+
+  end loop;
+  --dbms_output.put_line(row_sum);
+END;
+$body$
+LANGUAGE PLPGSQL
+SECURITY DEFINER
+;
+ALTER PROCEDURE delete_jedi_events_proc () OWNER TO panda;
+
 -- Drop the old procedure
 DROP PROCEDURE IF EXISTS doma_panda.update_worker_node_map();
 

schema/postgres/sqls/pg_PANDA_SCHEDULER_JOBS.sql

@@ -689,7 +689,7 @@ BEGIN
                       JOIN doma_panda.JEDI_Events PARTITION ('||p.PARTITION_NAME||') e 
                       ON (t.JEDITASKID = e.JEDITASKID)
                       WHERE t.STATUS IN (''done'', ''finished'', ''aborted'', ''failed'', ''broken'') 
-                      AND t.MODIFICATIONTIME < sysdate - 90' into STRICT taskid_cnt;
+                      AND t.MODIFICATIONTIME < sysdate - 30' into STRICT taskid_cnt;
 
     if (rows_cnt = taskid_cnt and rows_cnt <> 0) then
       --dbms_output.put_line('ALTER TABLE doma_panda.JEDI_Events DROP PARTITION '||p.PARTITION_NAME||' update global indexes;');

schema/postgres/sqls/pg_PANDA_TABLE.sql

@@ -875,7 +875,7 @@ CREATE TABLE jedi_tasks (
 	workqueue_id integer,
 	progress smallint,
 	failurerate smallint,
-	errordialog varchar(255),
+	errordialog varchar(510),
 	countrygroup varchar(20),
 	parent_tid bigint,
 	eventservice smallint,

schema/postgres/version

@@ -1 +1 @@
-0.0.29
+0.0.30