diff --git a/garage-latency-simple.R b/garage-latency-simple.R index f6fb5c1..9b9889e 100755 --- a/garage-latency-simple.R +++ b/garage-latency-simple.R @@ -68,10 +68,14 @@ bind_rows(a,b) %>% group_by(daemon,endpoint) %>% summarise( time_min = min(nanoseconds) / 1000 / 1000 ) -> c -st <- "100 measurements, 5 nodes, 100ms RTT + 20ms jitter between nodes\nno contention: latency is due to intra-cluster communications\ncolored bar = mean latency, error bar = min and max latency" +mknet_dc -> st -if (mknet_dc == "./mknet/multi-dc.yml") { - st <- "100 measurements, 6 nodes in 3 DC (2 nodes/DC), 100ms RTT + 20ms jitter between DC\nno contention: latency is due to intra-cluster communications\ncolored bar = mean latency, error bar = min and max latency" +if (st == "./mknet/single-dc.yml") { + st <- "100 measurements, 5 nodes, 100ms RTT + 20ms jitter between nodes\nno contention: latency is due to intra-cluster communications\ncolored bar = mean latency, error bar = min and max latency" +} else if (st == "./mknet/multi-dc.yml") { + st <- "100 measurements, 6 nodes in 3 DC (2 nodes/DC), 100ms RTT + 20ms jitter between DC\nno contention: latency is due to intra-cluster communications\ncolored bar = mean latency, error bar = min and max latency" +} else if (st == "./mknet/with-vdsl.yml") { + st <- "100 measurements, 5 nodes in 3 zones (2 VDSL and 1 fiber), check ./mknet/with-vdsl.yml\nno contention: latency is due to intra-cluster communications\ncolored bar = mean latency, error bar = min and max latency" } diff --git a/mknet/multi-dc.yml b/mknet/multi-dc.yml new file mode 100644 index 0000000..77e695b --- /dev/null +++ b/mknet/multi-dc.yml @@ -0,0 +1,46 @@ +links: + - &100 + bandwidth: 100M + latency: 500us + - &wan + bandwidth: 100M + latency: 50ms + jitter: 10ms + +zones: + - &dc1 + name: dc1 + internal: *100 + external: *wan + - &dc2 + name: dc2 + internal: *100 + external: *wan + - &dc3 + name: dc3 + internal: *100 + external: *wan + +servers: + - name: dc1s1 + zone: *dc1 + - name: dc1s2 + zone: *dc1 + - name: dc2s1 + zone: *dc2 + - name: dc2s2 + zone: *dc2 + - name: dc3s1 + zone: *dc3 + - name: dc3s2 + zone: *dc3 + +global: + subnet: + base: 'fc00:9a7a:9e::' + local: 64 + zone: 16 + latency-offset: 3ms + upstream: + ip: fc00:9a7a:9e:ffff:ffff:ffff:ffff:ffff + conn: *wan diff --git a/mknet/with-vdsl.yml b/mknet/with-vdsl.yml new file mode 100644 index 0000000..87d167b --- /dev/null +++ b/mknet/with-vdsl.yml @@ -0,0 +1,49 @@ +links: + - &100 + bandwidth: 100M + latency: 500us + - &1000 + bandwidth: 1000M + latency: 100us + - &vdsl + bandwidth: + up: 3M + down: 55M + latency: 50ms + jitter: 10ms + - &fiber + bandwidth: 400M + latency: 10ms + jitter: 3ms + +zones: + - &dc1 + name: dc1 + internal: *100 + external: *vdsl + - &dc2 + name: dc2 + internal: *1000 + external: *fiber + +servers: + - name: dc1s1 + zone: *dc1 + - name: dc1s2 + zone: *dc1 + - name: dc2s1 + zone: *dc2 + - name: dc2s2 + zone: *dc2 + - name: no_dc + <<: *vdsl + +global: + subnet: + base: 'fc00:9a7a:9e::' + local: 64 + zone: 16 + latency-offset: 3ms + upstream: + ip: fc00:9a7a:9e:ffff:ffff:ffff:ffff:ffff + conn: *fiber