提交 191f458c 编写于 作者: J Joao Pereira 提交者: =

Convert Insist to ereport on backend/storage

converted insist_log to ereport to match upstream
Changed the log level on lock.c from LOG to ERROR so that ereport will
halt the execution without using Insist
上级 7d7e6c55
......@@ -478,9 +478,7 @@ count_usable_fds(int max_to_probe, int *usable_fds, int *already_open)
{
/* Expect EMFILE or ENFILE, else it's fishy */
if (errno != EMFILE && errno != ENFILE)
{
insist_log(false, "dup(0) failed after %d successes: %m", used);
}
ereport(WARNING, (errmsg("dup(0) failed after %d successes: %m", used)));
break;
}
......
......@@ -46,7 +46,7 @@ int gp_trycompress_new(
PGFunction compressor,
CompressionState *compressionState)
{
Insist(PointerIsValid(compressor));
Assert(PointerIsValid(compressor));
gp_trycompress_generic(sourceData, sourceLen, compressedBuffer,
compressedBufferWithOverrrunLen, compressedLen,
......
......@@ -900,11 +900,10 @@ LockAcquireExtended(const LOCKTAG *locktag,
}
else if (proclock->holdMask & LOCKBIT_ON(lockmode))
{
elog(LOG, "lock %s on object %u/%u/%u is already held",
ereport(ERROR, (errmsg("lock %s on object %u/%u/%u is already held",
lockMethodTable->lockModeNames[lockmode],
lock->tag.locktag_field1, lock->tag.locktag_field2,
lock->tag.locktag_field3);
Insist(false);
lock->tag.locktag_field3)));
}
if (MyProc == lockHolderProcPtr)
......@@ -4019,13 +4018,10 @@ lock_twophase_recover(TransactionId xid, uint16 info,
* We shouldn't already hold the desired lock.
*/
if (proclock->holdMask & LOCKBIT_ON(lockmode))
{
elog(LOG, "lock %s on object %u/%u/%u is already held",
ereport(ERROR, (errmsg("lock %s on object %u/%u/%u is already held",
lockMethodTable->lockModeNames[lockmode],
lock->tag.locktag_field1, lock->tag.locktag_field2,
lock->tag.locktag_field3);
Insist(false);
}
lock->tag.locktag_field3)));
/*
* We ignore any possible conflicts and just grant ourselves the lock. Not
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册