Skip to content

Commit 890b273

Browse files
committed
[Java] Improved javadoc.
1 parent 39ad90c commit 890b273

5 files changed

Lines changed: 18 additions & 5 deletions

File tree

aeron-client/src/main/java/io/aeron/Aeron.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1188,6 +1188,8 @@ public Context driverTimeoutMs(final long value)
11881188

11891189
/**
11901190
* Set the timeout between service calls the to {@link ClientConductor} duty cycles in nanoseconds.
1191+
* <p>
1192+
* <b>Note:</b> the method is used for testing only.
11911193
*
11921194
* @param interServiceTimeout the timeout (ns) between service calls the to {@link ClientConductor} duty cycle.
11931195
* @return this for a fluent API.
@@ -1201,11 +1203,11 @@ Context interServiceTimeoutNs(final long interServiceTimeout)
12011203
/**
12021204
* Return the timeout between service calls to the duty cycle for the client.
12031205
* <p>
1204-
* When exceeded, {@link #errorHandler()} will be called and the active {@link Publication}s and {@link Image}s
1205-
* closed.
1206+
* When exceeded, {@link #errorHandler()} will be called and the active {@link Publication}s, {@link Image}s,
1207+
* and {@link Counter}s will be closed.
12061208
* <p>
12071209
* This value is controlled by the driver and included in the CnC file. It can be configured by adjusting
1208-
* the {@code aeron.client.liveness.timeout} property on the media driver.
1210+
* the {@code aeron.client.liveness.timeout} property set on the media driver.
12091211
*
12101212
* @return the timeout in nanoseconds between service calls as an allowed maximum.
12111213
*/

aeron-client/src/main/java/io/aeron/CommonContext.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,9 @@ public static InferableBoolean parse(final String value)
292292
*/
293293
private static final AtomicIntegerFieldUpdater<CommonContext> IS_CONCLUDED_UPDATER = newUpdater(
294294
CommonContext.class, "isConcluded");
295+
296+
private static final Map<String, Boolean> DEBUG_FIELDS_SEEN = new ConcurrentHashMap<>();
297+
295298
private volatile int isConcluded;
296299

297300
private long driverTimeoutMs = DRIVER_TIMEOUT_MS;
@@ -529,7 +532,6 @@ public long driverTimeoutMs()
529532
return checkDebugTimeout(driverTimeoutMs, TimeUnit.MILLISECONDS);
530533
}
531534

532-
private static final Map<String, Boolean> DEBUG_FIELDS_SEEN = new ConcurrentHashMap<>();
533535
/**
534536
* Override the supplied timeout with the debug value if it has been set and we are in debug mode.
535537
*

aeron-client/src/main/java/io/aeron/exceptions/ConductorServiceTimeoutException.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717

1818
/**
1919
* A timeout has occurred between service calls for the client conductor.
20+
* <p>
21+
* This is likely to occur due to GC or resource starvation where the client conductor thread has not being able to
22+
* run within the {@code aeron.client.liveness.timeout} property set on the media driver.
2023
*/
2124
public class ConductorServiceTimeoutException extends TimeoutException
2225
{

aeron-driver/src/main/java/io/aeron/driver/Configuration.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,9 @@ public class Configuration
328328
public static final long PUBLICATION_CONNECTION_TIMEOUT_DEFAULT_NS = TimeUnit.SECONDS.toNanos(5);
329329

330330
/**
331-
* Property name for if spy subscriptions simulate a connection.
331+
* Property name for if spy subscriptions simulate a connection to a network publication.
332+
* <p>
333+
* If true then this will override the min group size of the min and tagged flow control strategies.
332334
*/
333335
public static final String SPIES_SIMULATE_CONNECTION_PROP_NAME = "aeron.spies.simulate.connection";
334336

aeron-driver/src/main/java/io/aeron/driver/MediaDriver.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1382,6 +1382,8 @@ public Context publicationConnectionTimeoutNs(final long timeoutNs)
13821382

13831383
/**
13841384
* Does a spy subscription simulate a connection to a network publication.
1385+
* <p>
1386+
* If true then this will override the min group size of the min and tagged flow control strategies.
13851387
*
13861388
* @return true if a spy subscription should simulate a connection to a network publication.
13871389
* @see Configuration#SPIES_SIMULATE_CONNECTION_PROP_NAME
@@ -1393,6 +1395,8 @@ public boolean spiesSimulateConnection()
13931395

13941396
/**
13951397
* Does a spy subscription simulate a connection to a network publication.
1398+
* <p>
1399+
* If true then this will override the min group size of the min and tagged flow control strategies.
13961400
*
13971401
* @param spiesSimulateConnection true if a spy subscription simulates a connection to a network publication.
13981402
* @return this for a fluent API.

0 commit comments

Comments
 (0)