提交 76aa926e 编写于 作者: D Daniel Gustafsson

Reduce log severity in shareinput_clean_lk_ctxt()

If we are unable to unlink the temporary files in the shareinput
cleanup it seems quite aggressive to insist_log() and forcibly
exit. This cleanup can be called as part of transaction abort.
上级 5f5ef9e0
......@@ -549,40 +549,43 @@ static void sisc_lockname(char* p, int size, int share_id, const char* name)
static void shareinput_clean_lk_ctxt(ShareInput_Lk_Context *lk_ctxt)
{
int err;
elog(DEBUG1, "shareinput_clean_lk_ctxt cleanup lk ctxt %p", lk_ctxt);
if(lk_ctxt->readyfd >= 0)
{
err = gp_retry_close(lk_ctxt->readyfd);
insist_log(!err, "shareinput_clean_lk_ctxt cannot close readyfd: %m");
if (!lk_ctxt)
return;
lk_ctxt->readyfd = -1;
if (lk_ctxt->readyfd >= 0)
{
if (gp_retry_close(lk_ctxt->readyfd))
ereport(WARNING,
(errcode(ERRCODE_IO_ERROR),
errmsg("shareinput_clean_lk_ctxt cannot close readyfd: %m")));
}
if(lk_ctxt->donefd >= 0)
if (lk_ctxt->donefd >= 0)
{
err = gp_retry_close(lk_ctxt->donefd);
insist_log(!err, "shareinput_clean_lk_ctxt cannot close donefd: %m");
lk_ctxt->donefd = -1;
if (gp_retry_close(lk_ctxt->donefd))
ereport(WARNING,
(errcode(ERRCODE_IO_ERROR),
errmsg("shareinput_clean_lk_ctxt cannot close donefd: %m")));
}
if(lk_ctxt->del_ready && lk_ctxt->lkname_ready[0])
if (lk_ctxt->del_ready && lk_ctxt->lkname_ready[0])
{
err = unlink(lk_ctxt->lkname_ready);
insist_log(!err, "shareinput_clean_lk_ctxt cannot unlink \"%s\": %m", lk_ctxt->lkname_ready);
lk_ctxt->del_ready = false;
if (unlink(lk_ctxt->lkname_ready))
ereport(WARNING,
(errcode(ERRCODE_IO_ERROR),
errmsg("shareinput_clean_lk_ctxt cannot unlink \"%s\": %m",
lk_ctxt->lkname_ready)));
}
if(lk_ctxt->del_done && lk_ctxt->lkname_done[0])
if (lk_ctxt->del_done && lk_ctxt->lkname_done[0])
{
err = unlink(lk_ctxt->lkname_done);
insist_log(!err, "shareinput_clean_lk_ctxt cannot unline \"%s\": %m", lk_ctxt->lkname_done);
lk_ctxt->del_done = false;
if (unlink(lk_ctxt->lkname_done))
ereport(WARNING,
(errcode(ERRCODE_IO_ERROR),
errmsg("shareinput_clean_lk_ctxt cannot unlink \"%s\": %m",
lk_ctxt->lkname_done)));
}
gp_free(lk_ctxt);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册