temporary debugging of test_pgdata_import_smoke

libs/pageserver_api/src/models.rs

@@ -282,7 +282,7 @@ pub struct TimelineCreateRequest {
     pub mode: TimelineCreateRequestMode,
 }
 
-#[derive(Serialize, Deserialize, Clone)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
 #[serde(untagged)]
 pub enum TimelineCreateRequestMode {
     Branch {
@@ -307,7 +307,7 @@ pub enum TimelineCreateRequestMode {
     },
 }
 
-#[derive(Serialize, Deserialize, Clone)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct TimelineCreateRequestModeImportPgdata {
     pub location: ImportPgdataLocation,
     pub idempotency_key: ImportPgdataIdempotencyKey,
@@ -326,7 +326,7 @@ pub enum ImportPgdataLocation {
     },
 }
 
-#[derive(Serialize, Deserialize, Clone)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
 #[serde(transparent)]
 pub struct ImportPgdataIdempotencyKey(pub String);
 

storage_controller/src/service.rs

@@ -3275,9 +3275,10 @@ impl Service {
         mut create_req: TimelineCreateRequest,
     ) -> Result<TimelineInfo, ApiError> {
         tracing::info!(
-            "Creating timeline {}/{}",
+            "Creating timeline {}/{}, mode={:?}",
             tenant_id,
             create_req.new_timeline_id,
+            create_req.mode
         );
 
         let _tenant_lock = trace_shared_lock(

test_runner/regress/test_import_pgdata.py

@@ -152,7 +152,7 @@ def test_pgdata_import_smoke(
     )
 
     timeline_id = TimelineId.generate()
-    log.info("starting import")
+    log.info(f"starting import (tenant {tenant_id} timeline {timeline_id})")
     start = time.monotonic()
 
     idempotency = ImportPgdataIdemptencyKey.random()
@@ -172,6 +172,7 @@ def test_pgdata_import_smoke(
         },
     )
     env.neon_cli.mappings_map_branch(import_branch_name, tenant_id, timeline_id)
+    time.sleep(10)
 
     while True:
         locations = env.storage_controller.locate(tenant_id)