postgres/timescaledb
1
0
Fork 0
mirror of https://github.com/timescale/timescaledb.git synced 2025-05-22 22:11:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix background worker segfaults

Browse Source 
The background worker function to check the owner of a job did not have
proper error handling when the object referenced by a job did not exist
leading to a segfault in that case.  This patch adds proper checking of
return values and errors when the object cannot be found.
This commit is contained in:
Sven Klemm 2019-09-01 11:52:37 +02:00 committed by Sven Klemm
parent eaf93b5fc8
commit 41878e735b
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/bgw/job.c
View File

@ -74,14 +74,32 @@ ts_bgw_job_owner(BgwJob *job)
case JOB_TYPE_VERSION_CHECK: case JOB_TYPE_VERSION_CHECK:
return ts_catalog_database_info_get()->owner_uid; return ts_catalog_database_info_get()->owner_uid;
case JOB_TYPE_REORDER: case JOB_TYPE_REORDER:
return ts_rel_get_owner(ts_hypertable_id_to_relid( {
ts_bgw_policy_reorder_find_by_job(job->fd.id)->fd.hypertable_id)); BgwPolicyReorder *policy = ts_bgw_policy_reorder_find_by_job(job->fd.id);
if (policy == NULL)
elog(ERROR, "reorder policy for job with id \"%d\" not found", job->fd.id);
return ts_rel_get_owner(ts_hypertable_id_to_relid(policy->fd.hypertable_id));
}
case JOB_TYPE_DROP_CHUNKS: case JOB_TYPE_DROP_CHUNKS:
return ts_rel_get_owner(ts_hypertable_id_to_relid( {
ts_bgw_policy_drop_chunks_find_by_job(job->fd.id)->fd.hypertable_id)); BgwPolicyDropChunks *policy = ts_bgw_policy_drop_chunks_find_by_job(job->fd.id);
if (policy == NULL)
elog(ERROR, "drop_chunks policy for job with id \"%d\" not found", job->fd.id);
return ts_rel_get_owner(ts_hypertable_id_to_relid(policy->fd.hypertable_id));
}
case JOB_TYPE_CONTINUOUS_AGGREGATE: case JOB_TYPE_CONTINUOUS_AGGREGATE:
return ts_rel_get_owner( {
ts_continuous_agg_get_user_view_oid(ts_continuous_agg_find_by_job_id(job->fd.id))); ContinuousAgg *ca = ts_continuous_agg_find_by_job_id(job->fd.id);
if (ca == NULL)
elog(ERROR, "continuous aggregate for job with id \"%d\" not found", job->fd.id);
return ts_rel_get_owner(ts_continuous_agg_get_user_view_oid(ca));
}
case JOB_TYPE_UNKNOWN: case JOB_TYPE_UNKNOWN:
if (unknown_job_type_owner_hook != NULL) if (unknown_job_type_owner_hook != NULL)
return unknown_job_type_owner_hook(job); return unknown_job_type_owner_hook(job);

5
src/hypertable.c
View File

@ -65,6 +65,11 @@ ts_rel_get_owner(Oid relid)
HeapTuple tuple; HeapTuple tuple;
Oid ownerid; Oid ownerid;
if (!OidIsValid(relid))
ereport(ERROR,
(errcode(ERRCODE_UNDEFINED_TABLE),
errmsg("unable to get owner for relation with OID %u: invalid OID", relid)));
tuple = SearchSysCache1(RELOID, ObjectIdGetDatum(relid)); tuple = SearchSysCache1(RELOID, ObjectIdGetDatum(relid));
if (!HeapTupleIsValid(tuple)) if (!HeapTupleIsValid(tuple))