Add startupRetryPeriod to VehicleRentalUpdaterConfig.

VillePihlava · VillePihlava · commit a3e7512e1f7f · 2026-04-27T12:52:27.000+03:00
diff --git a/application/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/VehicleRentalParameters.java b/application/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/VehicleRentalParameters.java
@@ -9,8 +9,9 @@ public class VehicleRentalParameters extends VehicleRentalUpdaterParameters {
   public VehicleRentalParameters(
     String configRef,
     Duration frequency,
+    Duration startupRetryPeriod,
     VehicleRentalDataSourceParameters sourceParameters
   ) {
-    super(configRef, frequency, sourceParameters);
+    super(configRef, frequency, startupRetryPeriod, sourceParameters);
   }
 }
diff --git a/application/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/VehicleRentalServiceDirectoryFetcher.java b/application/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/VehicleRentalServiceDirectoryFetcher.java
@@ -39,6 +39,7 @@ public class VehicleRentalServiceDirectoryFetcher {
     VehicleRentalServiceDirectoryFetcher.class
   );
   private static final Duration DEFAULT_FREQUENCY = Duration.ofSeconds(15);
+  private static final Duration DEFAULT_STARTUP_RETRY_PERIOD = Duration.ofSeconds(0);
   private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper()
     .registerModule(new JavaTimeModule())
     .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
@@ -170,6 +171,7 @@ private VehicleRentalUpdater fetchAndCreateUpdater(
     VehicleRentalParameters vehicleRentalParameters = new VehicleRentalParameters(
       "vehicle-rental-service-directory:" + parameters.network(),
       DEFAULT_FREQUENCY,
+      DEFAULT_STARTUP_RETRY_PERIOD,
       parameters
     );
 
diff --git a/application/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/VehicleRentalUpdaterConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/VehicleRentalUpdaterConfig.java
@@ -1,6 +1,7 @@
 package org.opentripplanner.standalone.config.routerconfig.updaters;
 
 import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V1_5;
+import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_10;
 
 import java.time.Duration;
 import org.opentripplanner.standalone.config.framework.json.NodeAdapter;
@@ -23,6 +24,20 @@ public static VehicleRentalUpdaterParameters create(String configRef, NodeAdapte
         .since(V1_5)
         .summary("How often the data should be updated.")
         .asDuration(Duration.ofMinutes(1)),
+      c
+        .of("startupRetryPeriod")
+        .since(V2_10)
+        .summary(
+          "How long to retry loading the vehicle rental data source on startup if it initially fails."
+        )
+        .description(
+          """
+          The first time the data source is loaded, OTP will retry for this duration every
+          5 seconds before giving up. This is useful to handle temporary network failures during
+          OTP startup. Set to `PT0S` to disable retries.
+          """
+        )
+        .asDuration(Duration.ofSeconds(15)),
       VehicleRentalSourceFactory.create(sourceType, c)
     );
   }
diff --git a/application/src/main/java/org/opentripplanner/updater/vehicle_rental/VehicleRentalUpdater.java b/application/src/main/java/org/opentripplanner/updater/vehicle_rental/VehicleRentalUpdater.java
@@ -12,6 +12,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.opentripplanner.core.model.id.FeedScopedId;
+import org.opentripplanner.framework.retry.OtpRetry;
+import org.opentripplanner.framework.retry.OtpRetryBuilder;
 import org.opentripplanner.service.vehiclerental.VehicleRentalRepository;
 import org.opentripplanner.service.vehiclerental.model.GeofencingZone;
 import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace;
@@ -46,6 +48,8 @@
 public class VehicleRentalUpdater extends PollingGraphUpdater {
 
   private static final Logger LOG = LoggerFactory.getLogger(VehicleRentalUpdater.class);
+  private static final Duration RETRY_INTERVAL = Duration.ofSeconds(5);
+  private static final int RETRY_BACKOFF_MULTIPLIER = 1;
 
   private final Throttle unlinkedPlaceThrottle;
 
@@ -83,10 +87,18 @@ public VehicleRentalUpdater(
     // Adding a vehicle rental station service needs a graph writer runnable
     this.service = repository;
 
+    OtpRetry retry = new OtpRetryBuilder()
+      .withName("%s updater setup".formatted(nameForLogging))
+      .withMaxAttempts((int) parameters.startupRetryPeriod().dividedBy(RETRY_INTERVAL))
+      .withInitialRetryInterval(RETRY_INTERVAL)
+      .withBackoffMultiplier(RETRY_BACKOFF_MULTIPLIER)
+      .withRetryableException(UpdaterConstructionException.class::isInstance)
+      .build();
+
     try {
       // Do any setup if needed
-      source.setup();
-    } catch (UpdaterConstructionException e) {
+      retry.execute(source::setup);
+    } catch (InterruptedException e) {
       LOG.warn("Unable to setup updater: {}", nameForLogging, e);
     }
 
diff --git a/application/src/main/java/org/opentripplanner/updater/vehicle_rental/VehicleRentalUpdaterParameters.java b/application/src/main/java/org/opentripplanner/updater/vehicle_rental/VehicleRentalUpdaterParameters.java
@@ -8,15 +8,18 @@ public class VehicleRentalUpdaterParameters implements PollingGraphUpdaterParame
 
   private final String configRef;
   private final Duration frequency;
+  private final Duration startupRetryPeriod;
   private final VehicleRentalDataSourceParameters source;
 
   public VehicleRentalUpdaterParameters(
     String configRef,
     Duration frequency,
+    Duration startupRetryPeriod,
     VehicleRentalDataSourceParameters source
   ) {
     this.configRef = configRef;
     this.frequency = frequency;
+    this.startupRetryPeriod = startupRetryPeriod;
     this.source = source;
   }
 
@@ -33,6 +36,13 @@ public String configRef() {
     return configRef;
   }
 
+  /**
+   * How long to retry loading the vehicle rental data source on startup if it initially fails.
+   */
+  public Duration startupRetryPeriod() {
+    return startupRetryPeriod;
+  }
+
   public VehicleRentalDataSourceParameters sourceParameters() {
     return source;
   }
diff --git a/application/src/test/java/org/opentripplanner/updater/vehicle_rental/VehicleRentalUpdaterTest.java b/application/src/test/java/org/opentripplanner/updater/vehicle_rental/VehicleRentalUpdaterTest.java
@@ -30,6 +30,7 @@ class VehicleRentalUpdaterTest {
   public static final VehicleRentalUpdaterParameters PARAMS = new VehicleRentalUpdaterParameters(
     "A",
     Duration.ofMinutes(1),
+    Duration.ofSeconds(0),
     new FakeParams()
   );
   public static final DefaultVehicleRentalService SERVICE = new DefaultVehicleRentalService();
diff --git a/doc/user/GBFS-Config.md b/doc/user/GBFS-Config.md
@@ -30,6 +30,7 @@ Furthermore, support is limited to the following form factors:
 | [network](#u_1_network)                                                               |     `string`    | The name of the network to override the one derived from the source data.                                                                                      | *Optional* |               |  1.5  |
 | overloadingAllowed                                                                    |    `boolean`    | Allow leaving vehicles at a station even though there are no free slots.                                                                                       | *Optional* | `false`       |  2.2  |
 | [sourceType](#u_1_sourceType)                                                         |      `enum`     | What source of vehicle rental updater to use.                                                                                                                  | *Required* |               |  1.5  |
+| [startupRetryPeriod](#u_1_startupRetryPeriod)                                         |    `duration`   | How long to retry loading the vehicle rental data source on startup if it initially fails.                                                                     | *Optional* | `"PT15S"`     |  2.10 |
 | url                                                                                   |     `string`    | The URL to download the data from.                                                                                                                             | *Required* |               |  1.5  |
 | [headers](#u_1_headers)                                                               | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted.                                                                                     | *Optional* |               |  1.5  |
 | [rentalPickupTypes](#u_1_rentalPickupTypes)                                           |    `enum set`   | This is temporary and will be removed in a future version of OTP. Use this to specify the type of rental data that is allowed to be read from the data source. | *Optional* |               |  2.7  |
@@ -84,6 +85,18 @@ GBFS feeds must include a system_id which will be used as the default `network`.
 
 What source of vehicle rental updater to use.
 
+<h4 id="u_1_startupRetryPeriod">startupRetryPeriod</h4>
+
+**Since version:** `2.10` ∙ **Type:** `duration` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"PT15S"`   
+**Path:** /updaters/[1] 
+
+How long to retry loading the vehicle rental data source on startup if it initially fails.
+
+The first time the data source is loaded, OTP will retry for this duration every
+5 seconds before giving up. This is useful to handle temporary network failures during
+OTP startup. Set to `PT0S` to disable retries.
+
+
 <h4 id="u_1_headers">headers</h4>
 
 **Since version:** `1.5` ∙ **Type:** `map of string` ∙ **Cardinality:** `Optional`   

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,9 @@ public class VehicleRentalParameters extends VehicleRentalUpdaterParameters {`
`9`	`9`	`public VehicleRentalParameters(`
`10`	`10`	`String configRef,`
`11`	`11`	`Duration frequency,`
	`12`	`+ Duration startupRetryPeriod,`
`12`	`13`	`VehicleRentalDataSourceParameters sourceParameters`
`13`	`14`	`) {`
`14`		`- super(configRef, frequency, sourceParameters);`
	`15`	`+ super(configRef, frequency, startupRetryPeriod, sourceParameters);`
`15`	`16`	`}`
`16`	`17`	`}`