Skip to content

Commit 30c37fb

Browse files
johnalotoskijohnalotoski
committed
imp: add praosMode preview/preprod cfg fix until 10.5.0
1 parent 19e01fa commit 30c37fb

File tree

1 file changed

+42
-30
lines changed

1 file changed

+42
-30
lines changed

‎flake/colmena.nix‎

Lines changed: 42 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,18 @@ in
202202
};
203203
rel = {imports = [inputs.cardano-parts.nixosModules.role-relay topoRel];};
204204

205+
# Until 10.5 is released, 10.4.1 will fail to start without this because
206+
# node doesn't yet properly look up the relative path from topology to
207+
# peer snapshot file.
208+
#
209+
# Setting this option null fixes the problem, but will leave a
210+
# dangling peer snapshot file until cleaned up in the new tracing system
211+
# service PR.
212+
#
213+
# So until then, we'll switch from relative path that causes node failure
214+
# to absolute path which does not.
215+
praosMode = {services.cardano-node.peerSnapshotFile = i: "/etc/cardano-node/peer-snapshot-${toString i}.json";};
216+
205217
dbsync = {
206218
imports = [
207219
config.flake.cardano-parts.cluster.groups.default.meta.cardano-node-service
@@ -344,21 +356,21 @@ in
344356
preprodRelMig = mkWorldRelayMig 30000;
345357
previewRelMig = mkWorldRelayMig 30002;
346358

347-
newMetrics = {
348-
imports = [
349-
(
350-
# Existing tracer service requires a pkgs with commonLib defined in the cardano-node repo flake overlay.
351-
# We'll import it through flake-compat so we don't need a full flake input just for obtaining commonLib.
352-
import
353-
config.flake.cardano-parts.cluster.groups.default.meta.cardano-tracer-service
354-
(import
355-
"${config.flake.cardano-parts.cluster.groups.default.meta.cardano-node-service}/../../default.nix" {system = "x86_64-linux";})
356-
.legacyPackages
357-
.x86_64-linux
358-
)
359-
inputs.cardano-parts.nixosModules.profile-cardano-node-new-tracing
360-
];
361-
};
359+
# newMetrics = {
360+
# imports = [
361+
# (
362+
# # Existing tracer service requires a pkgs with commonLib defined in the cardano-node repo flake overlay.
363+
# # We'll import it through flake-compat so we don't need a full flake input just for obtaining commonLib.
364+
# import
365+
# config.flake.cardano-parts.cluster.groups.default.meta.cardano-tracer-service
366+
# (import
367+
# "${config.flake.cardano-parts.cluster.groups.default.meta.cardano-node-service}/../../default.nix" {system = "x86_64-linux";})
368+
# .legacyPackages
369+
# .x86_64-linux
370+
# )
371+
# inputs.cardano-parts.nixosModules.profile-cardano-node-new-tracing
372+
# ];
373+
# };
362374

363375
# logRejected = {
364376
# services = {
@@ -720,17 +732,17 @@ in
720732
# Setup cardano-world networks:
721733
# ---------------------------------------------------------------------------------------------------------
722734
# Preprod, two-thirds on release tag, one-third on pre-release tag
723-
preprod1-bp-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod1") node bp mithrilRelease (declMRel "preprod1-rel-a-1")];};
724-
preprod1-rel-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod1") node rel preprodRelMig mithrilRelay (declMSigner "preprod1-bp-a-1")];};
725-
preprod1-rel-b-1 = {imports = [eu-west-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod1") node rel preprodRelMig];};
726-
preprod1-rel-c-1 = {imports = [us-east-2 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod1") node rel preprodRelMig tcpTxOpt];};
735+
preprod1-bp-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod1") node bp praosMode mithrilRelease (declMRel "preprod1-rel-a-1")];};
736+
preprod1-rel-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod1") node rel praosMode preprodRelMig mithrilRelay (declMSigner "preprod1-bp-a-1")];};
737+
preprod1-rel-b-1 = {imports = [eu-west-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod1") node rel praosMode preprodRelMig];};
738+
preprod1-rel-c-1 = {imports = [us-east-2 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod1") node rel praosMode preprodRelMig tcpTxOpt];};
727739
preprod1-dbsync-a-1 = {imports = [eu-central-1 r6a-xlarge (ebs 200) (group "preprod1") dbsync pre smash preprodSmash];};
728-
preprod1-faucet-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod1") node faucet preprodFaucet];};
740+
preprod1-faucet-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod1") node faucet praosMode preprodFaucet];};
729741

730-
preprod2-bp-b-1 = {imports = [eu-west-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod2") node bp mithrilRelease (declMRel "preprod2-rel-b-1")];};
731-
preprod2-rel-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod2") node rel preprodRelMig];};
732-
preprod2-rel-b-1 = {imports = [eu-west-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod2") node rel preprodRelMig mithrilRelay (declMSigner "preprod2-bp-b-1")];};
733-
preprod2-rel-c-1 = {imports = [us-east-2 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod2") node rel preprodRelMig tcpTxOpt];};
742+
preprod2-bp-b-1 = {imports = [eu-west-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod2") node bp praosMode mithrilRelease (declMRel "preprod2-rel-b-1")];};
743+
preprod2-rel-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod2") node rel praosMode preprodRelMig];};
744+
preprod2-rel-b-1 = {imports = [eu-west-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod2") node rel praosMode preprodRelMig mithrilRelay (declMSigner "preprod2-bp-b-1")];};
745+
preprod2-rel-c-1 = {imports = [us-east-2 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod2") node rel praosMode preprodRelMig tcpTxOpt];};
734746

735747
preprod3-bp-c-1 = {imports = [us-east-2 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod3") node bp pre mithrilRelease (declMRel "preprod3-rel-c-1")];};
736748
preprod3-rel-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod3") node rel pre preprodRelMig];};
@@ -740,13 +752,13 @@ in
740752

741753
# ---------------------------------------------------------------------------------------------------------
742754
# Preview, one-third on release tag, two-thirds on pre-release tag
743-
preview1-bp-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview1") node bp mithrilRelease (declMRel "preview1-rel-a-1")];};
755+
preview1-bp-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview1") node bp praosMode mithrilRelease (declMRel "preview1-rel-a-1")];};
744756
# preview1-rel-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview1") node rel maxVerbosity previewRelMig mithrilRelay (declMSigner "preview1-bp-a-1")];};
745-
preview1-rel-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview1") node rel newMetrics previewRelMig mithrilRelay (declMSigner "preview1-bp-a-1")];};
746-
preview1-rel-b-1 = {imports = [eu-west-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview1") node minLog rel previewRelMig];};
747-
preview1-rel-c-1 = {imports = [us-east-2 r6a-large (ebs 80) (nodeRamPct 70) (group "preview1") node rel previewRelMig tcpTxOpt];};
748-
preview1-dbsync-a-1 = {imports = [eu-central-1 r6a-large (ebs 250) (group "preview1") dbsync pre smash previewSmash];};
749-
preview1-faucet-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview1") node faucet previewFaucet];};
757+
preview1-rel-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview1") node rel praosMode previewRelMig mithrilRelay (declMSigner "preview1-bp-a-1")];};
758+
preview1-rel-b-1 = {imports = [eu-west-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview1") node minLog rel praosMode previewRelMig];};
759+
preview1-rel-c-1 = {imports = [us-east-2 r6a-large (ebs 80) (nodeRamPct 70) (group "preview1") node rel praosMode previewRelMig tcpTxOpt];};
760+
preview1-dbsync-a-1 = {imports = [eu-central-1 r6a-large (ebs 250) (group "preview1") dbsync pre smash praosMode previewSmash];};
761+
preview1-faucet-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview1") node faucet praosMode previewFaucet];};
750762

751763
# Smallest d variant for testing
752764
preview1-test-a-1 = {

0 commit comments

Comments
 (0)