.vscode/launch.json

@@ -50,7 +50,7 @@
         "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
         "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
         "AYANOVA_METRICS_USE_INFLUXDB": "false",
-        "AYANOVA_SERVER_TEST_MODE":"false",
+        "AYANOVA_SERVER_TEST_MODE":"true",
         "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL":"small",
         "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET":"-7",
         "AYANOVA_BACKUP_PG_DUMP_PATH":"C:\\data\\code\\PostgreSQLPortable_12.0\\App\\PgSQL\\bin\\"

server/AyaNova/generator/CoreJobSweeper.cs

@@ -19,8 +19,10 @@ namespace AyaNova.Biz
         private static ILogger log = AyaNova.Util.ApplicationLogging.CreateLogger("CoreJobSweeper");
         private static DateTime lastSweep = DateTime.MinValue;
         private static TimeSpan SWEEP_EVERY_INTERVAL = new TimeSpan(0, 30, 0);
-        private static TimeSpan SUCCEEDED_JOBS_DELETE_AFTER_THIS_TIMESPAN = new TimeSpan(24, 0, 0);//24 hours
+        private static TimeSpan SUCCEEDED_JOBS_DELETE_AFTER_THIS_TIMESPAN = new TimeSpan(14, 0, 0, 0);//14 days
         private static TimeSpan FAILED_JOBS_DELETE_AFTER_THIS_TIMESPAN = new TimeSpan(14, 0, 0, 0);//14 days (gives people time to notice and look into it)
+        private static TimeSpan INTERNAL_JOBS_LOGS_DELETE_AFTER_THIS_TIMESPAN = new TimeSpan(14, 0, 0, 0);//14 days
+
         private static TimeSpan RUNNING_JOBS_BECOME_FAILED_AFTER_THIS_TIMESPAN = new TimeSpan(24, 0, 0);//24 hours (time running jobs are allowed to sit in "running" state before considered failed)
 
         ////////////////////////////////////////////////////////////////////////////////////////////////
@@ -46,12 +48,17 @@ namespace AyaNova.Biz
             dtDeleteCutoff = DateTime.UtcNow - FAILED_JOBS_DELETE_AFTER_THIS_TIMESPAN;
             await sweepAsync(ct, dtDeleteCutoff, JobStatus.Failed);
 
-
             //KILL STUCK JOBS
             //calculate cutoff to delete 
             DateTime dtRunningDeadline = DateTime.UtcNow - RUNNING_JOBS_BECOME_FAILED_AFTER_THIS_TIMESPAN;
             await killStuckJobsAsync(ct, dtRunningDeadline);
 
+            //SWEEP INTERNAL JOB LOG
+            //calculate cutoff to delete 
+            dtDeleteCutoff = DateTime.UtcNow - INTERNAL_JOBS_LOGS_DELETE_AFTER_THIS_TIMESPAN;
+            await SweepInternalJobsLogsAsync(ct, dtDeleteCutoff);
+
+
             lastSweep = DateTime.UtcNow;
         }
 
@@ -111,6 +118,32 @@ namespace AyaNova.Biz
         }
 
 
+        private static async Task SweepInternalJobsLogsAsync(AyContext ct, DateTime dtDeleteCutoff)
+        {
+
+            //Get the deleteable list (this is for reporting, could easily just do it in one go)
+            var logs = await ct.OpsJobLog
+                   .AsNoTracking()
+                   .Where(z => z.Created < dtDeleteCutoff)
+                   .OrderBy(z => z.Created)
+                   .ToListAsync();
+
+            log.LogTrace($"SweepInternalJobsLogsAsync processing: cutoff={dtDeleteCutoff.ToString()}, for {logs.Count.ToString()} log entries");
+
+            foreach (OpsJobLog l in logs)
+            {
+                try
+                {
+                    await ct.Database.ExecuteSqlInterpolatedAsync($"delete from aopsjoblog where gid = {l.GId}");
+                }
+                catch (Exception ex)
+                {
+                    log.LogError(ex, "SweepInternalJobsLogsAsync exception removed old log entries");
+                    throw (ex);
+                }
+            }
+        }
+
         /////////////////////////////////////////////////////////////////////
 
     }//eoc

server/AyaNova/util/AySchema.cs

@@ -23,7 +23,7 @@ namespace AyaNova.Util
         private const int DESIRED_SCHEMA_LEVEL = 11;
 
         internal const long EXPECTED_COLUMN_COUNT = 310;
-        internal const long EXPECTED_INDEX_COUNT = 134;
+        internal const long EXPECTED_INDEX_COUNT = 133;
 
         //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!!
 
@@ -402,8 +402,8 @@ $BODY$;
 
                 await ExecQueryAsync("CREATE TABLE aopsjob (gid uuid PRIMARY KEY, name text not null, created timestamp not null, exclusive bool not null, " +
                 "startafter timestamp not null, jobtype integer not null, subtype integer null, objectid bigint null, objecttype integer null, jobstatus integer not null, jobinfo text null)");
-                await ExecQueryAsync("CREATE TABLE aopsjoblog (gid uuid PRIMARY KEY, jobid uuid not null REFERENCES aopsjob (gid), created timestamp not null, statustext text not null)");
+                await ExecQueryAsync("CREATE TABLE aopsjoblog (gid uuid PRIMARY KEY, jobid uuid not null, created timestamp not null, statustext text not null)");
-
+                // REFERENCES aopsjob (gid)  took this out to allow for internal job logs with guid.empty and no parent job as there seems no need anyway
                 await SetSchemaLevelAsync(++currentSchema);
             }