From b9127dd6f88d3c66181ef6748167efd94283ff41 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Fri, 28 May 2021 13:58:47 +0200
Subject: Prepare for v0.3.0 and add migration path from v0.2.1.x

---
 src/rpc/membership.rs | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'src/rpc/membership.rs')

diff --git a/src/rpc/membership.rs b/src/rpc/membership.rs
index 37cf8105..72477539 100644
--- a/src/rpc/membership.rs
+++ b/src/rpc/membership.rs
@@ -240,11 +240,21 @@ impl System {
 		let net_config = match persist_config.load() {
 			Ok(x) => x,
 			Err(e) => {
-				info!(
-					"No valid previous network configuration stored ({}), starting fresh.",
-					e
-				);
-				NetworkConfig::new()
+				match Persister::<garage_rpc_021::ring::NetworkConfig>::new(
+					&metadata_dir,
+					"network_config",
+				)
+				.load()
+				{
+					Ok(old_config) => NetworkConfig::migrate_from_021(old_config),
+					Err(e2) => {
+						info!(
+							"No valid previous network configuration stored ({}, {}), starting fresh.",
+							e, e2
+						);
+						NetworkConfig::new()
+					}
+				}
 			}
 		};
 
-- 
cgit v1.2.3