Skip to content

Commit

Permalink
fix: init jobsdb logger at the right place (#2729)
Browse files Browse the repository at this point in the history
  • Loading branch information
chandumlg authored Nov 23, 2022
1 parent bc6afca commit ef64bba
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions jobsdb/jobsdb.go
Original file line number Diff line number Diff line change
Expand Up @@ -774,6 +774,7 @@ func (jd *HandleT) Setup(
}

func (jd *HandleT) init() {
jd.logger = pkgLogger.Child(jd.tablePrefix)
jd.dsListLock = lock.NewLocker()
jd.dsMigrationLock = lock.NewLocker()
if jd.MaxDSSize == nil {
Expand Down Expand Up @@ -849,7 +850,6 @@ func (jd *HandleT) init() {
func (jd *HandleT) workersAndAuxSetup() {
jd.assert(jd.tablePrefix != "", "tablePrefix received is empty")

jd.logger = pkgLogger.Child(jd.tablePrefix)
jd.dsEmptyResultCache = map[dataSetT]map[string]map[string]map[string]map[string]cacheEntry{}
if jd.registerStatusHandler {
admin.RegisterStatusHandler(jd.tablePrefix+"-jobsdb", jd)
Expand Down Expand Up @@ -1784,13 +1784,13 @@ func (jd *HandleT) migrateJobsInTx(ctx context.Context, tx *Tx, srcDS, destDS da
`with last_status as (select * from "v_last_%[1]s"),
inserted_jobs as
(
insert into %[3]q (job_id, workspace_id, uuid, user_id, custom_val, parameters, event_payload, event_count, created_at, expire_at)
insert into %[3]q (job_id, workspace_id, uuid, user_id, custom_val, parameters, event_payload, event_count, created_at, expire_at)
(select j.job_id, j.workspace_id, j.uuid, j.user_id, j.custom_val, j.parameters, j.event_payload, j.event_count, j.created_at, j.expire_at from %[2]q j left join last_status js on js.job_id = j.job_id
where js.job_id is null or js.job_state = ANY('{%[5]s}') order by j.job_id) returning job_id
),
insertedStatuses as
insertedStatuses as
(
insert into %[4]q (job_id, job_state, attempt, exec_time, retry_time, error_code, error_response, parameters)
insert into %[4]q (job_id, job_state, attempt, exec_time, retry_time, error_code, error_response, parameters)
(select job_id, job_state, attempt, exec_time, retry_time, error_code, error_response, parameters from last_status where job_state = ANY('{%[5]s}'))
)
select count(*) from inserted_jobs;`,
Expand Down Expand Up @@ -3796,7 +3796,7 @@ func (jd *HandleT) deleteJobStatusDSInTx(txHandler transactionHandler, ds dataSe
sqlFiltersString = "WHERE " + sqlFiltersString
}

sqlStatement := fmt.Sprintf(`DELETE FROM %[1]q
sqlStatement := fmt.Sprintf(`DELETE FROM %[1]q
WHERE id = ANY(
SELECT id from "v_last_%[1]s" where job_id IN (SELECT job_id from %[2]q %[3]s)
) %[4]s AND retry_time < $1`,
Expand Down

0 comments on commit ef64bba

Please sign in to comment.