Split struct prometheus from struct configuration #155

An-DJ · 2021-06-29T12:15:34Z

Split struct prometheus from struct configuration.

Close #153

jesperpedersen · 2021-06-29T15:22:41Z

src/include/pgagroal.h

@@ -142,6 +142,11 @@ extern void* shmem;
 */
 extern void* pipeline_shmem;

+/**
+ * The shared memory segment for prometheus connection


"prometheus connection" -> "the Prometheus data"

jesperpedersen · 2021-06-29T15:23:58Z

src/include/pgagroal.h

+ */
+struct prometheus_connection
+{
+   char database[MAX_DATABASE_LENGTH]; /**< The database */


struct prometheus_connection will have a 1-to-1 relationship with struct connection, so this can be an empty struct to begin with

jesperpedersen · 2021-06-29T15:25:07Z

src/include/pgagroal.h

@@ -235,6 +250,7 @@ struct prometheus

   atomic_ulong server_error[NUMBER_OF_SERVERS]; /**< The number of errors for a server */
   atomic_ulong failed_servers;                  /**< The number of failed servers */
+   struct prometheus_connection prometheus_connections[MAX_NUMBER_OF_CONNECTIONS];  /**< The number of prometheus connections */


This needs to be a FMA field, so we only use the memory that we need.

See how struct connection[]; is initialized after max_connections is known.

jesperpedersen · 2021-06-29T15:26:55Z

src/libpgagroal/prometheus.c

+
+   for (int i = 0; i < config->max_connections; i++)
+   {
+      memset(prometheus->prometheus_connections[i].database, 0, MAX_DATABASE_LENGTH);


Remove this memset with a general memset(&prometheus->prometheus_connections[i], 0, sizeof(struct prometheus_connection);

jesperpedersen · 2021-06-29T15:28:16Z

src/libpgagroal/prometheus.c


   for (int i = 0; i < NUMBER_OF_SERVERS; i++)
   {
-      atomic_store(&config->prometheus.server_error[i], 0);
+      atomic_store(&prometheus->server_error[i], 0);
   }
 }


This needs to reset the prometheus_connections as well

jesperpedersen · 2021-06-29T15:28:53Z

src/libpgagroal/prometheus.c

@@ -795,6 +845,10 @@ general_information(int client_fd)

   config = (struct configuration*)shmem;

+   struct prometheus* prometheus;


Keep definitions at the start of the function

jesperpedersen · 2021-06-29T15:31:06Z

src/main.c

@@ -396,6 +398,19 @@ main(int argc, char **argv)
   pgagroal_init_configuration(shmem);
   config = (struct configuration*)shmem;

+   prometheus_shmem_size = sizeof(struct prometheus);
+   if (pgagroal_create_shared_memory(prometheus_shmem_size, HUGEPAGE_OFF, &prometheus_shmem))


Huge page settings needs to come from the configuration

jesperpedersen · 2021-06-29T15:32:38Z

Look at my comments, then squash and force push

An-DJ · 2021-06-30T12:08:13Z

Look at my comments, then squash and force push

Done

jesperpedersen · 2021-06-30T15:27:26Z

src/libpgagroal/prometheus.c

+      return 1;
+   }
+
+   struct prometheus* prometheus;


Move this to the beginning of the function

jesperpedersen · 2021-06-30T15:29:05Z

src/libpgagroal/prometheus.c

+   struct configuration* config;
+
+   config = (struct configuration*) shmem;
+


Create local variables for the size and the memory segment.

Set p_size and p_shmem to 0 and NULL in the beginning of the function, and only assign them if everything is successful

jesperpedersen · 2021-06-30T15:29:41Z

src/libpgagroal/prometheus.c

@@ -791,6 +849,11 @@ static void
 general_information(int client_fd)
 {
   char* data = NULL;
+


White space

jesperpedersen · 2021-06-30T15:30:15Z

Just a few more

An-DJ · 2021-07-01T01:37:12Z

Just a few more

Done

jesperpedersen · 2021-07-01T13:38:31Z

Thanks for your contribution !

jesperpedersen requested changes Jun 29, 2021

View reviewed changes

jesperpedersen assigned An-DJ Jun 29, 2021

jesperpedersen added the enhancement Improvement to an existing feature label Jun 29, 2021

An-DJ force-pushed the split-prometheus branch from 4e19326 to 8824ae4 Compare June 30, 2021 12:06

jesperpedersen requested changes Jun 30, 2021

View reviewed changes

Split struct prometheus from struct configuration

9a6228a

An-DJ force-pushed the split-prometheus branch from 8824ae4 to 9a6228a Compare July 1, 2021 01:36

jesperpedersen closed this Jul 1, 2021

An-DJ mentioned this pull request Aug 20, 2021

GSoC 2021 Summary: Metrics and monitoring #170

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Split struct prometheus from struct configuration #155

Split struct prometheus from struct configuration #155

An-DJ commented Jun 29, 2021

jesperpedersen Jun 29, 2021

jesperpedersen Jun 29, 2021

jesperpedersen Jun 29, 2021

jesperpedersen Jun 29, 2021

jesperpedersen Jun 29, 2021

jesperpedersen Jun 29, 2021

jesperpedersen Jun 29, 2021

jesperpedersen commented Jun 29, 2021

An-DJ commented Jun 30, 2021

jesperpedersen Jun 30, 2021

jesperpedersen Jun 30, 2021

jesperpedersen Jun 30, 2021

jesperpedersen commented Jun 30, 2021

An-DJ commented Jul 1, 2021

jesperpedersen commented Jul 1, 2021

		@@ -795,6 +845,10 @@ general_information(int client_fd)

		config = (struct configuration*)shmem;

		struct prometheus* prometheus;

		struct configuration* config;

		config = (struct configuration*) shmem;

Split struct prometheus from struct configuration #155

Split struct prometheus from struct configuration #155

Conversation

An-DJ commented Jun 29, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jesperpedersen commented Jun 29, 2021

An-DJ commented Jun 30, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jesperpedersen commented Jun 30, 2021

An-DJ commented Jul 1, 2021

jesperpedersen commented Jul 1, 2021