Skip to content

Commit b514ef8

Browse files
authored
Change ledger file extensions to .json (#3784)
Ledger files are now serialized as json, and not toml. Change the extension to reflect this. Fixes #3723
1 parent 56aab7c commit b514ef8

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

sled-agent/src/bootstrap/agent.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ pub struct Agent {
227227
bootstore_peer_update_handle: JoinHandle<()>,
228228
}
229229

230-
const SLED_AGENT_REQUEST_FILE: &str = "sled-agent-request.toml";
230+
const SLED_AGENT_REQUEST_FILE: &str = "sled-agent-request.json";
231231
const BOOTSTORE_FSM_STATE_FILE: &str = "bootstore-fsm-state.json";
232232
const BOOTSTORE_NETWORK_CONFIG_FILE: &str = "bootstore-network-config.json";
233233

sled-agent/src/rack_setup/plan/service.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ impl Ledgerable for Plan {
114114
}
115115
fn generation_bump(&mut self) {}
116116
}
117-
const RSS_SERVICE_PLAN_FILENAME: &str = "rss-service-plan.toml";
117+
const RSS_SERVICE_PLAN_FILENAME: &str = "rss-service-plan.json";
118118

119119
impl Plan {
120120
pub async fn load(

sled-agent/src/rack_setup/plan/sled.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ impl Ledgerable for Plan {
3939
}
4040
fn generation_bump(&mut self) {}
4141
}
42-
const RSS_SLED_PLAN_FILENAME: &str = "rss-sled-plan.toml";
42+
const RSS_SLED_PLAN_FILENAME: &str = "rss-sled-plan.json";
4343

4444
#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
4545
pub struct Plan {

sled-agent/src/rack_setup/service.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
//! Rack setup occurs in distinct phases which are denoted by the prescence of
1717
//! configuration files.
1818
//!
19-
//! - /pool/int/UUID/config/rss-sled-plan.toml (Sled Plan)
20-
//! - /pool/int/UUID/config/rss-service-plan.toml (Service Plan)
19+
//! - /pool/int/UUID/config/rss-sled-plan.json (Sled Plan)
20+
//! - /pool/int/UUID/config/rss-service-plan.json (Service Plan)
2121
//! - /pool/int/UUID/config/rss-plan-completed.marker (Plan Execution Complete)
2222
//!
2323
//! ## Sled Plan

sled-agent/src/services.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ impl Config {
284284
}
285285

286286
// The filename of the ledger, within the provided directory.
287-
const SERVICES_LEDGER_FILENAME: &str = "services.toml";
287+
const SERVICES_LEDGER_FILENAME: &str = "services.json";
288288

289289
// The directory within the debug dataset in which bundles are created.
290290
const BUNDLE_DIRECTORY: &str = "bundle";
@@ -296,7 +296,7 @@ const ZONE_BUNDLE_DIRECTORY: &str = "zone";
296296
const ZONE_BUNDLE_METADATA_FILENAME: &str = "metadata.toml";
297297

298298
// A wrapper around `ZoneRequest`, which allows it to be serialized
299-
// to a toml file.
299+
// to a JSON file.
300300
#[derive(Clone, serde::Serialize, serde::Deserialize, schemars::JsonSchema)]
301301
struct AllZoneRequests {
302302
generation: Generation,

0 commit comments

Comments
 (0)