]> granicus.if.org Git - postgresql/commitdiff
Fix memory leak in TRUNCATE decoding
authorTomas Vondra <tomas.vondra@postgresql.org>
Mon, 3 Sep 2018 00:10:24 +0000 (02:10 +0200)
committerTomas Vondra <tomas.vondra@postgresql.org>
Mon, 3 Sep 2018 00:29:51 +0000 (02:29 +0200)
When decoding a TRUNCATE record, the relids array was being allocated in
the main ReorderBuffer memory context, but not released with the change
resulting in a memory leak.

The array was also ignored when serializing/deserializing the change,
assuming all the information is stored in the change itself.  So when
spilling the change to disk, we've only we have serialized only the
pointer to the relids array.  Thanks to never releasing the array,
the pointer however remained valid even after loading the change back
to memory, preventing an actual crash.

This fixes both the memory leak and (de)serialization.  The relids array
is still allocated in the main ReorderBuffer memory context (none of the
existing ones seems like a good match, and adding an extra context seems
like an overkill).  The allocation is wrapped in a new ReorderBuffer API
functions, to keep the details within reorderbuffer.c, just like the
other ReorderBufferGet methods do.

Author: Tomas Vondra
Discussion: https://www.postgresql.org/message-id/flat/66175a41-9342-2845-652f-1bd4c3ee50aa%402ndquadrant.com
Backpatch: 11, where decoding of TRUNCATE was introduced

src/backend/replication/logical/decode.c
src/backend/replication/logical/reorderbuffer.c
src/include/replication/reorderbuffer.h

index 59c003de9ceeca0ecb6bfb66df82f2e2ed6a40ea..afb497227e378c0cefc645c9026a36d8ea52714a 100644 (file)
@@ -859,7 +859,8 @@ DecodeTruncate(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
        if (xlrec->flags & XLH_TRUNCATE_RESTART_SEQS)
                change->data.truncate.restart_seqs = true;
        change->data.truncate.nrelids = xlrec->nrelids;
-       change->data.truncate.relids = palloc(xlrec->nrelids * sizeof(Oid));
+       change->data.truncate.relids = ReorderBufferGetRelids(ctx->reorder,
+                                                                                                                 xlrec->nrelids);
        memcpy(change->data.truncate.relids, xlrec->relids,
                   xlrec->nrelids * sizeof(Oid));
        ReorderBufferQueueChange(ctx->reorder, XLogRecGetXid(r),
index 5f4ae1291c66c72a8416eb0b8a129b31215458de..7e349f4ca420373678f0e6053dda1690c53d11cd 100644 (file)
@@ -409,10 +409,16 @@ ReorderBufferReturnChange(ReorderBuffer *rb, ReorderBufferChange *change)
                        }
                        break;
                        /* no data in addition to the struct itself */
+               case REORDER_BUFFER_CHANGE_TRUNCATE:
+                       if (change->data.truncate.relids != NULL)
+                       {
+                               ReorderBufferReturnRelids(rb, change->data.truncate.relids);
+                               change->data.truncate.relids = NULL;
+                       }
+                       break;
                case REORDER_BUFFER_CHANGE_INTERNAL_SPEC_CONFIRM:
                case REORDER_BUFFER_CHANGE_INTERNAL_COMMAND_ID:
                case REORDER_BUFFER_CHANGE_INTERNAL_TUPLECID:
-               case REORDER_BUFFER_CHANGE_TRUNCATE:
                        break;
        }
 
@@ -450,6 +456,37 @@ ReorderBufferReturnTupleBuf(ReorderBuffer *rb, ReorderBufferTupleBuf *tuple)
        pfree(tuple);
 }
 
+/*
+ * Get an array for relids of truncated relations.
+ *
+ * We use the global memory context (for the whole reorder buffer), because
+ * none of the existing ones seems like a good match (some are SLAB, so we
+ * can't use those, and tup_context is meant for tuple data, not relids). We
+ * could add yet another context, but it seems like an overkill - TRUNCATE is
+ * not particularly common operation, so it does not seem worth it.
+ */
+Oid *
+ReorderBufferGetRelids(ReorderBuffer *rb, int nrelids)
+{
+       Oid        *relids;
+       Size    alloc_len;
+
+       alloc_len = sizeof(Oid) * nrelids;
+
+       relids = (Oid *) MemoryContextAlloc(rb->context, alloc_len);
+
+       return relids;
+}
+
+/*
+ * Free an array of relids.
+ */
+void
+ReorderBufferReturnRelids(ReorderBuffer *rb, Oid *relids)
+{
+       pfree(relids);
+}
+
 /*
  * Return the ReorderBufferTXN from the given buffer, specified by Xid.
  * If create is true, and a transaction doesn't already exist, create it
@@ -2412,6 +2449,26 @@ ReorderBufferSerializeChange(ReorderBuffer *rb, ReorderBufferTXN *txn,
                                break;
                        }
                case REORDER_BUFFER_CHANGE_TRUNCATE:
+                       {
+                               Size    size;
+                               char   *data;
+
+                               /* account for the OIDs of truncated relations */
+                               size = sizeof(Oid) * change->data.truncate.nrelids;
+                               sz += size;
+
+                               /* make sure we have enough space */
+                               ReorderBufferSerializeReserve(rb, sz);
+
+                               data = ((char *) rb->outbuf) + sizeof(ReorderBufferDiskChange);
+                               /* might have been reallocated above */
+                               ondisk = (ReorderBufferDiskChange *) rb->outbuf;
+
+                               memcpy(data, change->data.truncate.relids, size);
+                               data += size;
+
+                               break;
+                       }
                case REORDER_BUFFER_CHANGE_INTERNAL_SPEC_CONFIRM:
                case REORDER_BUFFER_CHANGE_INTERNAL_COMMAND_ID:
                case REORDER_BUFFER_CHANGE_INTERNAL_TUPLECID:
@@ -2695,6 +2752,16 @@ ReorderBufferRestoreChange(ReorderBuffer *rb, ReorderBufferTXN *txn,
                        }
                        /* the base struct contains all the data, easy peasy */
                case REORDER_BUFFER_CHANGE_TRUNCATE:
+                       {
+                               Oid        *relids;
+
+                               relids = ReorderBufferGetRelids(rb,
+                                                                                               change->data.truncate.nrelids);
+                               memcpy(relids, data, change->data.truncate.nrelids * sizeof(Oid));
+                               change->data.truncate.relids = relids;
+
+                               break;
+                       }
                case REORDER_BUFFER_CHANGE_INTERNAL_SPEC_CONFIRM:
                case REORDER_BUFFER_CHANGE_INTERNAL_COMMAND_ID:
                case REORDER_BUFFER_CHANGE_INTERNAL_TUPLECID:
index 1f52f6bde73430f29bc7c15aac17ef159ae2e87d..7787edf7b67cde762bab7388ad938d9b95ebffab 100644 (file)
@@ -402,6 +402,9 @@ void                ReorderBufferReturnTupleBuf(ReorderBuffer *, ReorderBufferTupleBuf *tuple)
 ReorderBufferChange *ReorderBufferGetChange(ReorderBuffer *);
 void           ReorderBufferReturnChange(ReorderBuffer *, ReorderBufferChange *);
 
+Oid * ReorderBufferGetRelids(ReorderBuffer *, int nrelids);
+void ReorderBufferReturnRelids(ReorderBuffer *, Oid *relids);
+
 void           ReorderBufferQueueChange(ReorderBuffer *, TransactionId, XLogRecPtr lsn, ReorderBufferChange *);
 void ReorderBufferQueueMessage(ReorderBuffer *, TransactionId, Snapshot snapshot, XLogRecPtr lsn,
                                                  bool transactional, const char *prefix,