Merge branch 'PGPROEE10-pgpro-791' into PGPROEE10

Author: vbwagner

contrib/pg_cgroups/Makefile

@@ -0,0 +1,19 @@
+# contrib/pg_cgroups/Makefile
+
+MODULE_big = pg_cgroups
+OBJS = pg_cgroups.o $(WIN32RES)
+
+EXTENSION = pg_cgroups
+DATA = pg_cgroups--1.0
+PGFILEDESC = "pg_cgroups - limit resource usage"
+
+ifdef USE_PGXS
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
+include $(PGXS)
+else
+subdir = contrib/pg_cgroups
+top_builddir = ../..
+include $(top_builddir)/src/Makefile.global
+include $(top_srcdir)/contrib/contrib-global.mk
+endif

contrib/pg_cgroups/pg_cgroups.c

@@ -0,0 +1,5 @@
+# pg_cgroups extension
+comment = 'limit PostgreSQL resource usage'
+default_version = '1.0'
+module_pathname = '$libdir/pg_cgroups'
+relocatable = true

contrib/pg_cgroups/pg_cgroups.control

@@ -4095,7 +4095,10 @@ ProcArrayGetPriorityUsageTotals(uint64 *spent_sum, uint64 *blks_read_sum,
 								uint64 *blks_write_sum,
 								uint32 *cpu_priority_sum,
 								uint32 *ioread_priority_sum,
-								uint32 *iowrite_priority_sum)
+								uint32 *iowrite_priority_sum,
+								uint32 *cpu_priority_max,
+								uint32 *ioread_priority_max,
+								uint32 *iowrite_priority_max)
 {
 	ProcArrayStruct *arrayP = procArray;
 	int			i;
@@ -4106,24 +4109,38 @@ ProcArrayGetPriorityUsageTotals(uint64 *spent_sum, uint64 *blks_read_sum,
 	*cpu_priority_sum = 0;
 	*ioread_priority_sum = 0;
 	*iowrite_priority_sum = 0;
+	*cpu_priority_max = 0;
+	*ioread_priority_max = 0;
+	*iowrite_priority_max = 0;
 
 	LWLockAcquire(ProcArrayLock, LW_SHARED);
 
 	for (i = 0; i < arrayP->numProcs; i++)
 	{
 		int			pgprocno = arrayP->pgprocnos[i];
 		volatile PGPROC *proc = &allProcs[pgprocno];
+		int32		cpu_priority,
+					ioread_priority,
+					iowrite_priority;
 
 		*spent_sum += pg_atomic_read_u64(&proc->priorityStats.ru_spent);
 		*blks_read_sum += pg_atomic_read_u64(&proc->priorityStats.blks_read);
 		*blks_write_sum += pg_atomic_read_u64(&proc->priorityStats.blks_write);
 
-		*cpu_priority_sum += pg_atomic_read_u32(
+		cpu_priority = pg_atomic_read_u32(
 			&proc->priorityStats.cpu_priority_value);
-		*ioread_priority_sum += pg_atomic_read_u32(
+		ioread_priority = pg_atomic_read_u32(
 			&proc->priorityStats.ioread_priority_value);
-		*iowrite_priority_sum += pg_atomic_read_u32(
+		iowrite_priority = pg_atomic_read_u32(
 			&proc->priorityStats.iowrite_priority_value);
+
+		*cpu_priority_sum += cpu_priority;
+		*ioread_priority_sum += ioread_priority;
+		*iowrite_priority_sum += iowrite_priority;
+
+		*cpu_priority_max = Max(*cpu_priority_max, cpu_priority);
+		*ioread_priority_max = Max(*ioread_priority_max, ioread_priority);
+		*iowrite_priority_max = Max(*iowrite_priority_max, iowrite_priority);
 	}
 
 	LWLockRelease(ProcArrayLock);