Supavisor V2

.github/workflows/elixir.yml

@@ -3,6 +3,7 @@ on:
   pull_request:
     branches:
       - main
+      - v2
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -35,50 +36,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-mix-
       - name: Install dependencies
-        run: mix deps.get
-
-  compile:
-    name: Compile project in test env
-    runs-on: u22-arm-runner
-    needs: [deps]
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Elixir
-        id: beam
-        uses: erlef/setup-beam@v1
-        with:
-          otp-version: '25.3.2.7'
-          elixir-version: '1.14.5'
-      - name: Cache Mix
-        uses: actions/cache@v4
-        with:
-          path: deps
-          key: ${{ runner.os }}-mix-${{ hashFiles(format('{0}{1}', github.workspace, '/mix.lock')) }}
-          restore-keys: |
-            ${{ runner.os }}-mix-
-      - name: Cache Build
-        uses: actions/cache@v4
-        with:
-          path: |
-            _build/${{ env.MIX_ENV }}
-          key: ${{ runner.os }}-build-${{ env.MIX_ENV }}-${{ steps.beam.outputs.otp-version }}-${{ steps.beam.outputs.elixir-version }}-${{ hashFiles(format('{0}{1}', github.workspace, '/mix.lock')) }}-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.MIX_ENV }}-
-      - name: Cache native
-        uses: actions/cache@v4
-        id: native-cache
-        with:
-          path: |
-            priv/native
-          key: ${{ runner.os }}-build-native-${{ steps.beam.outputs.otp-version }}-${{ steps.beam.outputs.elixir-version }}-${{ hashFiles(format('{0}{1}', github.workspace, '/native/**/*')) }}
-      - name: Set up Rust
-        uses: dtolnay/rust-toolchain@v1
-        if: steps.native-cache.outputs.cache-hit != 'true' || steps.elixir-cache.output.cache-hit != 'true'
-        with:
-          toolchain: stable
-      - name: Compile
-        run: mix compile
+        run: mix deps.get --check-locked
 
   format:
     name: Formatting checks
@@ -98,15 +56,13 @@ jobs:
         with:
           path: deps
           key: ${{ runner.os }}-mix-${{ hashFiles(format('{0}{1}', github.workspace, '/mix.lock')) }}
-          restore-keys: |
-            ${{ runner.os }}-mix-
       - name: Run format check
         run: mix format --check-formatted
 
   credo:
     name: Code style
     runs-on: u22-arm-runner
-    needs: [compile]
+    needs: [deps]
 
     steps:
       - uses: actions/checkout@v4
@@ -121,23 +77,15 @@ jobs:
         with:
           path: deps
           key: ${{ runner.os }}-mix-${{ hashFiles(format('{0}{1}', github.workspace, '/mix.lock')) }}
-          restore-keys: |
-            ${{ runner.os }}-mix-
-      - name: Cache Build
-        uses: actions/cache@v4
-        with:
-          path: |
-            _build/${{ env.MIX_ENV }}
-          key: ${{ runner.os }}-build-${{ env.MIX_ENV }}-${{ steps.beam.outputs.otp-version }}-${{ steps.beam.outputs.elixir-version }}-${{ hashFiles(format('{0}{1}', github.workspace, '/mix.lock')) }}-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.MIX_ENV }}-
+      - name: Compile deps
+        run: mix deps.compile
       - name: Credo checks
-        run: mix credo --strict --mute-exit-status
+        run: mix credo --strict --all --mute-exit-status
 
   tests:
     name: Run tests
     runs-on: u22-arm-runner
-    needs: [compile]
+    needs: [deps]
 
     steps:
       - uses: actions/checkout@v4
@@ -149,30 +97,29 @@ jobs:
           elixir-version: '1.14.5'
       - name: Set up Rust
         uses: dtolnay/rust-toolchain@v1
-        if: steps.native-cache.outputs.cache-hit != 'true' || steps.elixir-cache.output.cache-hit != 'true'
         with:
           toolchain: stable
       - name: Cache Mix
         uses: actions/cache@v4
         with:
           path: deps
           key: ${{ runner.os }}-mix-${{ hashFiles(format('{0}{1}', github.workspace, '/mix.lock')) }}
-          restore-keys: |
-            ${{ runner.os }}-mix-
-      - name: Cache Build
-        uses: actions/cache@v4
-        with:
-          path: |
-            _build/${{ env.MIX_ENV }}
-          key: ${{ runner.os }}-build-${{ env.MIX_ENV }}-${{ steps.beam.outputs.otp-version }}-${{ steps.beam.outputs.elixir-version }}-${{ hashFiles(format('{0}{1}', github.workspace, '/mix.lock')) }}-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.MIX_ENV }}-
       - name: Cache native
         uses: actions/cache@v4
         with:
           path: |
-            priv/native
-          key: ${{ runner.os }}-build-native-${{ steps.beam.outputs.otp-version }}-${{ steps.beam.outputs.elixir-version }}-${{ hashFiles(format('{0}{1}', github.workspace, '/native/**/*')) }}
+            _build/${{ env.MIX_ENV }}/lib/supavisor/native
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+          key: ${{ runner.os }}-build-native-${{ hashFiles(format('{0}{1}', github.workspace, '/native/**/Cargo.lock')) }}
+          restore-keys: |
+            ${{ runner.os }}-build-native-
+      - name: Compile deps
+        run: mix deps.compile
+      - name: Compile
+        run: mix compile
       - name: Set up Postgres
         run: docker-compose -f ./docker-compose.db.yml up -d
       - name: Start epmd
@@ -183,7 +130,7 @@ jobs:
   dialyzer:
     name: Dialyze
     runs-on: u22-arm-runner
-    needs: [compile]
+    needs: [deps]
 
     steps:
       - uses: actions/checkout@v4
@@ -195,36 +142,38 @@ jobs:
           elixir-version: '1.14.5'
       - name: Set up Rust
         uses: dtolnay/rust-toolchain@v1
-        if: steps.native-cache.outputs.cache-hit != 'true' || steps.elixir-cache.output.cache-hit != 'true'
         with:
           toolchain: stable
       - name: Cache Mix
         uses: actions/cache@v4
         with:
           path: deps
           key: ${{ runner.os }}-mix-${{ hashFiles(format('{0}{1}', github.workspace, '/mix.lock')) }}
-          restore-keys: |
-            ${{ runner.os }}-mix-
-      - name: Cache Build
-        uses: actions/cache@v4
-        with:
-          path: |
-            _build/${{ env.MIX_ENV }}
-          key: ${{ runner.os }}-build-${{ env.MIX_ENV }}-${{ steps.beam.outputs.otp-version }}-${{ steps.beam.outputs.elixir-version }}-${{ hashFiles(format('{0}{1}', github.workspace, '/mix.lock')) }}-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.MIX_ENV }}-
       - name: Cache native
         uses: actions/cache@v4
         with:
           path: |
-            priv/native
-          key: ${{ runner.os }}-build-native-${{ steps.beam.outputs.otp-version }}-${{ steps.beam.outputs.elixir-version }}-${{ hashFiles(format('{0}{1}', github.workspace, '/native/**/*')) }}
+            _build/${{ env.MIX_ENV }}/lib/supavisor/native
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+          key: ${{ runner.os }}-build-native-${{ hashFiles(format('{0}{1}', github.workspace, '/native/**/Cargo.lock')) }}
+          restore-keys: |
+            ${{ runner.os }}-build-native-
+      - name: Compile deps
+        run: mix deps.compile
+      - name: Compile
+        run: mix compile
       - name: Retrieve PLT Cache
         uses: actions/cache@v4
         id: plt-cache
         with:
           path: _build/${{ env.MIX_ENV }}/*.plt
           key: ${{ runner.os }}-${{ steps.beam.outputs.otp-version }}-${{ steps.beam.outputs.elixir-version }}-plts-${{ hashFiles(format('{0}{1}', github.workspace, '/mix.lock')) }}
+          restore-keys: |
+            ${{ runner.os }}-${{ steps.beam.outputs.otp-version }}-${{ steps.beam.outputs.elixir-version }}-plts-
+
       - name: Create PLTs
         if: steps.plt-cache.outputs.cache-hit != 'true'
         run: |

.gitignore

@@ -37,3 +37,5 @@ burrito_out/*
 supavisor-*.tar.gz
 
 priv/native/*
+*.bggg
+/.pre-commit-config.yaml

.mailmap

@@ -1,5 +1,6 @@
 Stanislav Muzhyk <[email protected]> <[email protected]>
+
 Joel Lee <[email protected]> <[email protected]>
 Joel Lee <[email protected]> <[email protected]>
 
-Dimitris Zorbas <[email protected]> <[email protected]>
+Łukasz Jan Niemier <[email protected]> <[email protected]>

Makefile

@@ -12,6 +12,8 @@ dev:
 	SECRET_KEY_BASE="dev" \
 	CLUSTER_POSTGRES="true" \
 	DB_POOL_SIZE="5" \
+	METRICS_DISABLED="false" \
+	AVAILABILITY_ZONE="ap-southeast-1b" \
 	ERL_AFLAGS="-kernel shell_history enabled +zdbbl 2097151" \
 	iex --name [email protected] --cookie cookie -S mix run --no-halt
 
@@ -26,7 +28,9 @@ dev.node2:
 	CLUSTER_POSTGRES="true" \
 	PROXY_PORT_SESSION="5442" \
 	PROXY_PORT_TRANSACTION="6553" \
-	PARTISAN_PEER_PORT="10201" \
+	PROXY_PORT="5402" \
+	NODE_IP=localhost \
+	AVAILABILITY_ZONE="ap-southeast-1c" \
 	ERL_AFLAGS="-kernel shell_history enabled" \
 	iex --name [email protected] --cookie cookie -S mix phx.server
 
@@ -41,15 +45,8 @@ dev.node3:
 	CLUSTER_POSTGRES="true" \
 	PROXY_PORT_SESSION="5443" \
 	PROXY_PORT_TRANSACTION="6554" \
-	PARTISAN_PEER_PORT="10202" \
 	ERL_AFLAGS="-kernel shell_history enabled" \
-	iex --name [email protected] --cookie cookie -S mix phx.server	
-
-dev_bin:
-	MIX_ENV=dev mix release supavisor_bin && ls -l burrito_out
-
-bin:
-	MIX_ENV=prod mix release supavisor_bin && ls -l burrito_out
+	iex --name [email protected] --cookie cookie -S mix phx.server
 
 db_migrate:
 	mix ecto.migrate --prefix _supavisor --log-migrator-sql
@@ -65,15 +62,29 @@ db_rebuild:
 	docker-compose -f ./docker-compose.db.yml build
 	make db_start
 
+PGBENCH_USER ?= postgres.sys
+PGBENCH_PORT ?= 6543
+PGBENCH_RATE ?= 5000
+PGBENCH_DURATION ?= 60
+PGBENCH_CLIENTS ?= 1000
+
 pgbench_init:
 	PGPASSWORD=postgres pgbench -i -h 127.0.0.1 -p 6432 -U postgres -d postgres
 
 pgbench_short:
-	PGPASSWORD=postgres pgbench -M extended --transactions 5 --jobs 4 --client 1 -h localhost -p 7654 -U transaction.localhost postgres
+	PGPASSWORD=postgres pgbench -M extended --transactions 5 --jobs 4 --client 1 -h localhost -p 6543 -U postgres.sys postgres
 
 pgbench_long:
 	PGPASSWORD=postgres pgbench -M extended --transactions 100 --jobs 10 --client 60 -h localhost -p 7654 -U transaction.localhost postgres
 
+pgbench:
+	PGPASSWORD="postgres" pgbench \
+		   postgres://${PGBENCH_USER}@localhost:${PGBENCH_PORT}/postgres?sslmode=disable \
+		   -Srn -T ${PGBENCH_DURATION} \
+		   -j 8 -c ${PGBENCH_CLIENTS} \
+		   -P 10 -M extended \
+		   --rate ${PGBENCH_RATE}
+
 clean:
 	rm -rf _build && rm -rf deps
 
@@ -94,5 +105,37 @@ dev_start_rel:
 	FLY_ALLOC_ID=111e4567-e89b-12d3-a456-426614174000 \
 	SECRET_KEY_BASE="dev" \
 	CLUSTER_POSTGRES="true" \
-	ERL_AFLAGS="-kernel shell_history enabled" \
-	./_build/dev/rel/supavisor/bin/supavisor start_iex
+	DB_POOL_SIZE="5" \
+	_build/prod/rel/supavisor/bin/supavisor start_iex
+
+prod_rel:
+	MIX_ENV=prod METRICS_DISABLED=true mix compile && \
+	MIX_ENV=prod METRICS_DISABLED=true mix release supavisor
+
+prod_start_rel:
+	MIX_ENV=prod \
+	NODE_NAME="localhost" \
+	VAULT_ENC_KEY="aHD8DZRdk2emnkdktFZRh3E9RNg4aOY7" \
+	API_JWT_SECRET=dev \
+	METRICS_JWT_SECRET=dev \
+	REGION=eu \
+	FLY_ALLOC_ID=111e4567-e89b-12d3-a456-426614174000 \
+	SECRET_KEY_BASE="dev" \
+	CLUSTER_POSTGRES="true" \
+	DB_POOL_SIZE="5" \
+	_build/prod/rel/supavisor/bin/supavisor start_iex
+
+prod_start_rel2:
+	MIX_ENV=prod \
+	NODE_NAME=node2 \
+	PORT=4001 \
+	VAULT_ENC_KEY="aHD8DZRdk2emnkdktFZRh3E9RNg4aOY7" \
+	API_JWT_SECRET=dev \
+	METRICS_JWT_SECRET=dev \
+	REGION=eu \
+	SECRET_KEY_BASE="dev" \
+	CLUSTER_POSTGRES="true" \
+	PROXY_PORT_SESSION="5442" \
+	PROXY_PORT_TRANSACTION="6553" \
+	NODE_IP=localhost \
+	_build/prod/rel/supavisor/bin/supavisor start_iex

VERSION

@@ -1 +1 @@
-1.1.67
+2.0.5

config/config.exs

@@ -10,7 +10,11 @@ import Config
 config :supavisor,
   ecto_repos: [Supavisor.Repo],
   version: Mix.Project.config()[:version],
-  env: Mix.env()
+  env: Mix.env(),
+  metrics_disabled: System.get_env("METRICS_DISABLED") == "true",
+  switch_active_count: System.get_env("SWITCH_ACTIVE_COUNT", "100") |> String.to_integer(),
+  reconnect_retries: System.get_env("RECONNECT_RETRIES", "5") |> String.to_integer(),
+  subscribe_retries: System.get_env("SUBSCRIBE_RETRIES", "20") |> String.to_integer()
 
 # Configures the endpoint
 config :supavisor, SupavisorWeb.Endpoint,
@@ -23,7 +27,18 @@ config :supavisor, SupavisorWeb.Endpoint,
 # Configures Elixir's Logger
 config :logger, :console,
   format: "$time $metadata[$level] $message\n",
-  metadata: [:request_id, :project, :user, :region, :instance_id, :mode, :type]
+  metadata: [
+    :request_id,
+    :project,
+    :user,
+    :region,
+    :instance_id,
+    :mode,
+    :type,
+    :app_name,
+    :peer_ip,
+    :local
+  ]
 
 # Use Jason for JSON parsing in Phoenix
 config :phoenix, :json_library, Jason

config/dev.exs

@@ -62,8 +62,20 @@ config :supavisor, SupavisorWeb.Endpoint,
 config :logger, :console,
   format: "$time [$level] $message $metadata\n",
   level: :debug,
-  # level: :error,
-  metadata: [:error_code, :file, :line, :pid, :project, :user, :mode, :type]
+  # level: :notice,
+  metadata: [
+    :error_code,
+    :file,
+    :line,
+    :pid,
+    :project,
+    :user,
+    :mode,
+    :type,
+    :app_name,
+    :peer_ip,
+    :local
+  ]
 
 # Set a higher stacktrace during development. Avoid configuring such
 # in production as building large stacktraces may be expensive.