From bf0f29f8b67b6b2cfea5fb5c0ddd808e9bd378c6 Mon Sep 17 00:00:00 2001 From: Brian Picciano Date: Sun, 16 Oct 2022 16:52:07 +0200 Subject: [PATCH] Fix small error in daemon child process diagram --- docs/dev/daemon-process-tree.plantuml | 2 +- docs/dev/daemon-process-tree.svg | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/dev/daemon-process-tree.plantuml b/docs/dev/daemon-process-tree.plantuml index 09b108c..c2c9462 100644 --- a/docs/dev/daemon-process-tree.plantuml +++ b/docs/dev/daemon-process-tree.plantuml @@ -47,7 +47,7 @@ state AppDir { } state "./bin/garage -c $_RUNTIME_DIR_PATH/garage-N.toml server" as garage - state "./bin/cryptic-net-main garage-apply-layout-diff" as garageApplyLayoutDiff { + state "./bin/garage-apply-layout-diff" as garageApplyLayoutDiff { garageApplyLayoutDiff : * Runs once then exits garageApplyLayoutDiff : * Updates cluster topo } diff --git a/docs/dev/daemon-process-tree.svg b/docs/dev/daemon-process-tree.svg index 7923f10..d5974a3 100644 --- a/docs/dev/daemon-process-tree.svg +++ b/docs/dev/daemon-process-tree.svg @@ -1,5 +1,5 @@ AppDirAll relative paths are relative to the root of the AppDir./bin/dnsmasq -d -C $_RUNTIME_DIR_PATH/dnsmasq.conf./bin/nebula -config $_RUNTIME_DIR_PATH/nebula.yml./bin/garage -c $_RUNTIME_DIR_PATH/garage-N.toml server./AppRunSet PATH to APPDIR/bin./bin/cryptic-net-main entrypoint daemon -c ./daemon.ymlCreate runtime dir at $_RUNTIME_DIR_PATHLock runtime dirMerge given and default daemon.yml filesCopy bootstrap.tgz into $_DATA_DIR_PATH, if it's not thereMerge daemon.yml config into bootstrap.tgzRun child processes./bin/dnsmasq-entrypointCreate $_RUNTIME_DIR_PATH/dnsmasq.conf./bin/cryptic-net-main nebula-entrypointCreate $_RUNTIME_DIR_PATH/nebula.yml./bin/cryptic-net-main garage-entrypointCreate $_RUNTIME_DIR_PATH/garage-N.toml(one per storage allocation)Run child processes./bin/cryptic-net-main garage-apply-layout-diffRuns once then exitsUpdates cluster topo./bin/cryptic-net-main update-global-bucketRuns once then exitsUpdates the bootstrap data for the host in garage for other hosts to query./cryptic-net daemon -c ./daemon.ymlAppDirAll relative paths are relative to the root of the AppDir./bin/dnsmasq -d -C $_RUNTIME_DIR_PATH/dnsmasq.conf./bin/nebula -config $_RUNTIME_DIR_PATH/nebula.yml./bin/garage -c $_RUNTIME_DIR_PATH/garage-N.toml server./AppRunSet PATH to APPDIR/bin./bin/cryptic-net-main entrypoint daemon -c ./daemon.ymlCreate runtime dir at $_RUNTIME_DIR_PATHLock runtime dirMerge given and default daemon.yml filesCopy bootstrap.tgz into $_DATA_DIR_PATH, if it's not thereMerge daemon.yml config into bootstrap.tgzRun child processes./bin/dnsmasq-entrypointCreate $_RUNTIME_DIR_PATH/dnsmasq.conf./bin/cryptic-net-main nebula-entrypointCreate $_RUNTIME_DIR_PATH/nebula.yml./bin/cryptic-net-main garage-entrypointCreate $_RUNTIME_DIR_PATH/garage-N.toml(one per storage allocation)Run child processes./bin/garage-apply-layout-diffRuns once then exitsUpdates cluster topo./bin/cryptic-net-main update-global-bucketRuns once then exitsUpdates the bootstrap data for the host in garage for other hosts to query./cryptic-net daemon -c ./daemon.ymlexecexecchild< link nebulaEntrypoint to nebula-->execchild (only if >1 storage allocation defined in daemon.yml)child (one per storage allocation)childchildchildchild