Skip to content

HDDS-4309. Fix inconsistency recon config keys starting with recon and not ozone #1478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vivekratnavel merged 4 commits into from
Oct 7, 2020
Merged

HDDS-4309. Fix inconsistency recon config keys starting with recon and not ozone #1478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
beeeda9
Fix inconsistenc recon config keys starting with recon and not ozone
Oct 6, 2020
f0b4c83
HDDS-4309 . add old ozone recon keys as deprecated
Oct 7, 2020
62fb697
HDDS-4309. add unit test deprecated config keys
Oct 7, 2020
a2bd180
HDDS-4309. solve checkstyle issue
Oct 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions hadoop-hdds/common/src/main/resources/ozone-default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2322,7 +2322,7 @@
</description>
</property>
<property>
<name>recon.om.connection.request.timeout</name>
<name>ozone.recon.om.connection.request.timeout</name>
<value>5000</value>
<tag>OZONE, RECON, OM</tag>
<description>
Expand All @@ -2331,7 +2331,7 @@
</description>
</property>
<property>
<name>recon.om.connection.timeout</name>
<name>ozone.recon.om.connection.timeout</name>
<value>5s</value>
<tag>OZONE, RECON, OM</tag>
<description>
Expand All @@ -2340,7 +2340,7 @@
</description>
</property>
<property>
<name>recon.om.socket.timeout</name>
<name>ozone.recon.om.socket.timeout</name>
<value>5s</value>
<tag>OZONE, RECON, OM</tag>
<description>
Expand All @@ -2349,23 +2349,23 @@
</description>
</property>
<property>
<name>recon.om.snapshot.task.initial.delay</name>
<name>ozone.recon.om.snapshot.task.initial.delay</name>
<value>1m</value>
<tag>OZONE, RECON, OM</tag>
<description>
Initial delay in MINUTES by Recon to request OM DB Snapshot.
</description>
</property>
<property>
<name>recon.om.snapshot.task.interval.delay</name>
<name>ozone.recon.om.snapshot.task.interval.delay</name>
<value>10m</value>
<tag>OZONE, RECON, OM</tag>
<description>
Interval in MINUTES by Recon to request OM DB Snapshot.
</description>
</property>
<property>
<name>recon.om.snapshot.task.flush.param</name>
<name>ozone.recon.om.snapshot.task.flush.param</name>
<value>false</value>
<tag>OZONE, RECON, OM</tag>
<description>
Expand Down
2 changes: 1 addition & 1 deletion hadoop-hdds/docs/content/feature/Recon.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ ozone.recon.http-address | 0.0.0.0:9888 | The address and the base port where th
ozone.recon.address | 0.0.0.0:9891 | RPC address of the Recon.
ozone.recon.db.dir | none | Directory where the Recon Server stores its metadata.
ozone.recon.om.db.dir | none | Directory where the Recon Server stores its OM snapshot DB.
recon.om.snapshot.task.interval.delay | 10m | Interval in MINUTES by Recon to request OM DB Snapshot.
ozone.recon.om.snapshot.task.interval.delay | 10m | Interval in MINUTES by Recon to request OM DB Snapshot.
2 changes: 1 addition & 1 deletion hadoop-ozone/dist/src/main/compose/ozone/docker-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ OZONE-SITE.XML_ozone.recon.db.dir=/data/metadata/recon
OZONE-SITE.XML_ozone.scm.client.address=scm
OZONE-SITE.XML_hdds.datanode.dir=/data/hdds
OZONE-SITE.XML_ozone.recon.address=recon:9891
OZONE-SITE.XML_recon.om.snapshot.task.interval.delay=1m
OZONE-SITE.XML_ozone.recon.om.snapshot.task.interval.delay=1m

no_proxy=om,scm,s3g,recon,kdc,localhost,127.0.0.1
4 changes: 2 additions & 2 deletions hadoop-ozone/dist/src/main/compose/ozonesecure-om-ha/docker-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ OZONE-SITE.XML_ozone.scm.client.address=scm
OZONE-SITE.XML_hdds.block.token.enabled=true
OZONE-SITE.XML_ozone.replication=3

OZONE-SITE.XML_recon.om.snapshot.task.interval.delay=1m
OZONE-SITE.XML_ozone.recon.om.snapshot.task.interval.delay=1m
OZONE-SITE.XML_ozone.recon.db.dir=/data/metadata/recon
OZONE-SITE.XML_recon.om.snapshot.task.initial.delay=20s
OZONE-SITE.XML_ozone.recon.om.snapshot.task.initial.delay=20s
OZONE-SITE.XML_ozone.recon.address=recon:9891

OZONE-SITE.XML_ozone.security.enabled=true
Expand Down
4 changes: 2 additions & 2 deletions hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ OZONE-SITE.XML_ozone.scm.client.address=scm
OZONE-SITE.XML_hdds.block.token.enabled=true
OZONE-SITE.XML_ozone.replication=3

OZONE-SITE.XML_recon.om.snapshot.task.interval.delay=1m
OZONE-SITE.XML_ozone.recon.om.snapshot.task.interval.delay=1m
OZONE-SITE.XML_ozone.recon.db.dir=/data/metadata/recon
OZONE-SITE.XML_recon.om.snapshot.task.initial.delay=20s
OZONE-SITE.XML_ozone.recon.om.snapshot.task.initial.delay=20s
OZONE-SITE.XML_ozone.recon.address=recon:9891

OZONE-SITE.XML_ozone.security.enabled=true
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/dist/src/main/compose/upgrade/docker-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ OZONE-SITE.XML_ozone.recon.db.dir=/data/metadata/recon
OZONE-SITE.XML_ozone.scm.client.address=scm
OZONE-SITE.XML_hdds.datanode.dir=/data/hdds
OZONE-SITE.XML_ozone.recon.address=recon:9891
OZONE-SITE.XML_recon.om.snapshot.task.interval.delay=1m
OZONE-SITE.XML_ozone.recon.om.snapshot.task.interval.delay=1m

no_proxy=om,scm,s3g,kdc,localhost,127.0.0.1
11 changes: 9 additions & 2 deletions .../integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,15 @@ private void addPropertiesNotInXml() {
OzoneConfigKeys.OZONE_ACL_AUTHORIZER_CLASS_NATIVE,
OzoneConfigKeys.OZONE_S3_AUTHINFO_MAX_LIFETIME_KEY,
ReconServerConfigKeys.OZONE_RECON_SCM_DB_DIR,
ReconServerConfigKeys.RECON_METRICS_HTTP_CONNECTION_TIMEOUT,
ReconServerConfigKeys.RECON_METRICS_HTTP_CONNECTION_REQUEST_TIMEOUT,
ReconServerConfigKeys.OZONE_RECON_METRICS_HTTP_CONNECTION_TIMEOUT,
ReconServerConfigKeys
.OZONE_RECON_METRICS_HTTP_CONNECTION_REQUEST_TIMEOUT,
ReconServerConfigKeys.RECON_OM_SOCKET_TIMEOUT,
ReconServerConfigKeys.RECON_OM_CONNECTION_TIMEOUT,
ReconServerConfigKeys.RECON_OM_CONNECTION_REQUEST_TIMEOUT,
ReconServerConfigKeys.RECON_OM_SNAPSHOT_TASK_INITIAL_DELAY,
ReconServerConfigKeys.RECON_OM_SNAPSHOT_TASK_INTERVAL_DELAY,
ReconServerConfigKeys.RECON_OM_SNAPSHOT_TASK_FLUSH_PARAM,
OMConfigKeys.OZONE_OM_RATIS_SNAPSHOT_AUTO_TRIGGER_THRESHOLD_KEY
// TODO HDDS-2856
));
Expand Down
32 changes: 21 additions & 11 deletions ...tegration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@

import static java.net.HttpURLConnection.HTTP_CREATED;
import static java.net.HttpURLConnection.HTTP_OK;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.RECON_OM_CONNECTION_REQUEST_TIMEOUT;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.RECON_OM_CONNECTION_REQUEST_TIMEOUT_DEFAULT;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.RECON_OM_CONNECTION_TIMEOUT;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.RECON_OM_CONNECTION_TIMEOUT_DEFAULT;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.RECON_OM_SOCKET_TIMEOUT;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.RECON_OM_SOCKET_TIMEOUT_DEFAULT;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.OZONE_RECON_OM_CONNECTION_REQUEST_TIMEOUT;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.OZONE_RECON_OM_CONNECTION_REQUEST_TIMEOUT_DEFAULT;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.OZONE_RECON_OM_CONNECTION_TIMEOUT;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.OZONE_RECON_OM_CONNECTION_TIMEOUT_DEFAULT;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.OZONE_RECON_OM_SOCKET_TIMEOUT;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.OZONE_RECON_OM_SOCKET_TIMEOUT_DEFAULT;
import static org.apache.hadoop.ozone.recon.spi.impl.OzoneManagerServiceProviderImpl.OmSnapshotTaskName.OmDeltaRequest;
import static org.apache.hadoop.ozone.recon.spi.impl.OzoneManagerServiceProviderImpl.OmSnapshotTaskName.OmSnapshotRequest;

Expand Down Expand Up @@ -89,14 +89,24 @@ public class TestReconWithOzoneManager {
public static void init() throws Exception {
conf = new OzoneConfiguration();
int socketTimeout = (int) conf.getTimeDuration(
RECON_OM_SOCKET_TIMEOUT, RECON_OM_SOCKET_TIMEOUT_DEFAULT,
OZONE_RECON_OM_SOCKET_TIMEOUT,
conf.get(
ReconServerConfigKeys.RECON_OM_SOCKET_TIMEOUT,
OZONE_RECON_OM_SOCKET_TIMEOUT_DEFAULT),
TimeUnit.MILLISECONDS);
int connectionTimeout = (int) conf.getTimeDuration(
RECON_OM_CONNECTION_TIMEOUT,
RECON_OM_CONNECTION_TIMEOUT_DEFAULT, TimeUnit.MILLISECONDS);
OZONE_RECON_OM_CONNECTION_TIMEOUT,
conf.get(
ReconServerConfigKeys.RECON_OM_CONNECTION_TIMEOUT,
OZONE_RECON_OM_CONNECTION_TIMEOUT_DEFAULT),
TimeUnit.MILLISECONDS);
int connectionRequestTimeout = (int)conf.getTimeDuration(
RECON_OM_CONNECTION_REQUEST_TIMEOUT,
RECON_OM_CONNECTION_REQUEST_TIMEOUT_DEFAULT, TimeUnit.MILLISECONDS);
OZONE_RECON_OM_CONNECTION_REQUEST_TIMEOUT,
conf.get(
ReconServerConfigKeys.RECON_OM_CONNECTION_REQUEST_TIMEOUT,
OZONE_RECON_OM_CONNECTION_REQUEST_TIMEOUT_DEFAULT),
TimeUnit.MILLISECONDS
);
RequestConfig config = RequestConfig.custom()
.setConnectTimeout(socketTimeout)
.setConnectionRequestTimeout(connectionTimeout)
Expand Down
48 changes: 34 additions & 14 deletions hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconServerConfigKeys.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
*/
@InterfaceAudience.Public
@InterfaceStability.Unstable
public final class ReconServerConfigKeys {
public final class ReconServerConfigKeys {

public static final String OZONE_RECON_HTTP_ENABLED_KEY =
"ozone.recon.http.enabled";
Expand Down Expand Up @@ -60,29 +60,47 @@ public final class ReconServerConfigKeys {

public static final String RECON_STORAGE_DIR = "recon";

public static final String OZONE_RECON_OM_SOCKET_TIMEOUT =
"ozone.recon.om.socket.timeout";
public static final String OZONE_RECON_OM_SOCKET_TIMEOUT_DEFAULT = "5s";
@Deprecated
public static final String RECON_OM_SOCKET_TIMEOUT =
"recon.om.socket.timeout";
public static final String RECON_OM_SOCKET_TIMEOUT_DEFAULT = "5s";

public static final String OZONE_RECON_OM_CONNECTION_TIMEOUT =
"ozone.recon.om.connection.timeout";
public static final String OZONE_RECON_OM_CONNECTION_TIMEOUT_DEFAULT = "5s";
@Deprecated
public static final String RECON_OM_CONNECTION_TIMEOUT =
"recon.om.connection.timeout";
public static final String RECON_OM_CONNECTION_TIMEOUT_DEFAULT = "5s";

public static final String OZONE_RECON_OM_CONNECTION_REQUEST_TIMEOUT =
"ozone.recon.om.connection.request.timeout";
public static final String OZONE_RECON_OM_CONNECTION_REQUEST_TIMEOUT_DEFAULT =
"5s";
@Deprecated
public static final String RECON_OM_CONNECTION_REQUEST_TIMEOUT =
"recon.om.connection.request.timeout";

public static final String RECON_OM_CONNECTION_REQUEST_TIMEOUT_DEFAULT = "5s";

public static final String OZONE_RECON_OM_SNAPSHOT_TASK_INITIAL_DELAY =
"ozone.recon.om.snapshot.task.initial.delay";
public static final String
OZONE_RECON_OM_SNAPSHOT_TASK_INITIAL_DELAY_DEFAULT = "1m";
@Deprecated
public static final String RECON_OM_SNAPSHOT_TASK_INITIAL_DELAY =
"recon.om.snapshot.task.initial.delay";
public static final String
RECON_OM_SNAPSHOT_TASK_INITIAL_DELAY_DEFAULT = "1m";

public static final String RECON_OM_SNAPSHOT_TASK_INTERVAL =
"recon.om.snapshot.task.interval.delay";
public static final String RECON_OM_SNAPSHOT_TASK_INTERVAL_DEFAULT
public static final String OZONE_RECON_OM_SNAPSHOT_TASK_INTERVAL_DELAY =
"ozone.recon.om.snapshot.task.interval.delay";
public static final String OZONE_RECON_OM_SNAPSHOT_TASK_INTERVAL_DEFAULT
= "10m";
@Deprecated
public static final String RECON_OM_SNAPSHOT_TASK_INTERVAL_DELAY =
"recon.om.snapshot.task.interval.delay";

public static final String OZONE_RECON_OM_SNAPSHOT_TASK_FLUSH_PARAM =
"ozone.recon.om.snapshot.task.flush.param";
@Deprecated
public static final String RECON_OM_SNAPSHOT_TASK_FLUSH_PARAM =
"recon.om.snapshot.task.flush.param";

Expand All @@ -96,17 +114,19 @@ public final class ReconServerConfigKeys {
public static final String OZONE_RECON_HTTP_AUTH_TYPE =
OZONE_RECON_HTTP_AUTH_CONFIG_PREFIX + "type";

public static final String RECON_METRICS_HTTP_CONNECTION_TIMEOUT =
public static final String OZONE_RECON_METRICS_HTTP_CONNECTION_TIMEOUT =
"ozone.recon.metrics.http.connection.timeout";

public static final String RECON_METRICS_HTTP_CONNECTION_TIMEOUT_DEFAULT =
public static final String
OZONE_RECON_METRICS_HTTP_CONNECTION_TIMEOUT_DEFAULT =
"10s";

public static final String RECON_METRICS_HTTP_CONNECTION_REQUEST_TIMEOUT =
public static final String
OZONE_RECON_METRICS_HTTP_CONNECTION_REQUEST_TIMEOUT =
"ozone.recon.metrics.http.connection.request.timeout";

public static final String
RECON_METRICS_HTTP_CONNECTION_REQUEST_TIMEOUT_DEFAULT = "10s";
OZONE_RECON_METRICS_HTTP_CONNECTION_REQUEST_TIMEOUT_DEFAULT = "10s";

/**
* Private constructor for utility class.
Expand Down
52 changes: 34 additions & 18 deletions ...src/main/java/org/apache/hadoop/ozone/recon/spi/impl/OzoneManagerServiceProviderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import org.apache.hadoop.ozone.om.protocol.OzoneManagerProtocol;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.DBUpdatesRequest;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.ServicePort.Type;
import org.apache.hadoop.ozone.recon.ReconServerConfigKeys;
import org.apache.hadoop.ozone.recon.ReconUtils;
import org.apache.hadoop.ozone.recon.metrics.OzoneManagerSyncMetrics;
import org.apache.hadoop.ozone.recon.recovery.ReconOMMetadataManager;
Expand All @@ -61,15 +62,15 @@
import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_HTTP_AUTH_TYPE;
import static org.apache.hadoop.ozone.recon.ReconConstants.RECON_OM_SNAPSHOT_DB;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.OZONE_RECON_OM_SNAPSHOT_DB_DIR;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.RECON_OM_CONNECTION_REQUEST_TIMEOUT;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.RECON_OM_CONNECTION_REQUEST_TIMEOUT_DEFAULT;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.RECON_OM_CONNECTION_TIMEOUT;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.RECON_OM_CONNECTION_TIMEOUT_DEFAULT;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.RECON_OM_SNAPSHOT_TASK_FLUSH_PARAM;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.RECON_OM_SNAPSHOT_TASK_INITIAL_DELAY;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.RECON_OM_SNAPSHOT_TASK_INITIAL_DELAY_DEFAULT;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.RECON_OM_SNAPSHOT_TASK_INTERVAL;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.RECON_OM_SNAPSHOT_TASK_INTERVAL_DEFAULT;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.OZONE_RECON_OM_CONNECTION_REQUEST_TIMEOUT;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.OZONE_RECON_OM_CONNECTION_REQUEST_TIMEOUT_DEFAULT;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.OZONE_RECON_OM_CONNECTION_TIMEOUT;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.OZONE_RECON_OM_CONNECTION_TIMEOUT_DEFAULT;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.OZONE_RECON_OM_SNAPSHOT_TASK_FLUSH_PARAM;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.OZONE_RECON_OM_SNAPSHOT_TASK_INITIAL_DELAY;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.OZONE_RECON_OM_SNAPSHOT_TASK_INITIAL_DELAY_DEFAULT;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.OZONE_RECON_OM_SNAPSHOT_TASK_INTERVAL_DELAY;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.OZONE_RECON_OM_SNAPSHOT_TASK_INTERVAL_DEFAULT;
import static org.apache.ratis.proto.RaftProtos.RaftPeerRole.LEADER;
import org.hadoop.ozone.recon.schema.tables.daos.ReconTaskStatusDao;
import org.hadoop.ozone.recon.schema.tables.pojos.ReconTaskStatus;
Expand Down Expand Up @@ -121,11 +122,18 @@ public OzoneManagerServiceProviderImpl(
OzoneManagerProtocol ozoneManagerClient) {

int connectionTimeout = (int) configuration.getTimeDuration(
RECON_OM_CONNECTION_TIMEOUT,
RECON_OM_CONNECTION_TIMEOUT_DEFAULT, TimeUnit.MILLISECONDS);
OZONE_RECON_OM_CONNECTION_TIMEOUT,
configuration.get(
ReconServerConfigKeys.RECON_OM_CONNECTION_TIMEOUT,
OZONE_RECON_OM_CONNECTION_TIMEOUT_DEFAULT),
TimeUnit.MILLISECONDS);
int connectionRequestTimeout = (int)configuration.getTimeDuration(
RECON_OM_CONNECTION_REQUEST_TIMEOUT,
RECON_OM_CONNECTION_REQUEST_TIMEOUT_DEFAULT, TimeUnit.MILLISECONDS);
OZONE_RECON_OM_CONNECTION_REQUEST_TIMEOUT,
configuration.get(
ReconServerConfigKeys.RECON_OM_CONNECTION_REQUEST_TIMEOUT,
OZONE_RECON_OM_CONNECTION_REQUEST_TIMEOUT_DEFAULT),
TimeUnit.MILLISECONDS
);

connectionFactory =
URLConnectionFactory.newDefaultURLConnectionFactory(connectionTimeout,
Expand All @@ -151,7 +159,11 @@ public OzoneManagerServiceProviderImpl(
}

boolean flushParam = configuration.getBoolean(
RECON_OM_SNAPSHOT_TASK_FLUSH_PARAM, false);
OZONE_RECON_OM_SNAPSHOT_TASK_FLUSH_PARAM,
configuration.getBoolean(
ReconServerConfigKeys.RECON_OM_SNAPSHOT_TASK_FLUSH_PARAM,
false)
);

if (flushParam) {
omDBSnapshotUrl += "?" + OZONE_DB_CHECKPOINT_REQUEST_FLUSH + "=true";
Expand Down Expand Up @@ -205,12 +217,16 @@ public void start() {
}
reconTaskController.start();
long initialDelay = configuration.getTimeDuration(
RECON_OM_SNAPSHOT_TASK_INITIAL_DELAY,
RECON_OM_SNAPSHOT_TASK_INITIAL_DELAY_DEFAULT,
OZONE_RECON_OM_SNAPSHOT_TASK_INITIAL_DELAY,
configuration.get(
ReconServerConfigKeys.RECON_OM_SNAPSHOT_TASK_INITIAL_DELAY,
OZONE_RECON_OM_SNAPSHOT_TASK_INITIAL_DELAY_DEFAULT),
TimeUnit.MILLISECONDS);
long interval = configuration.getTimeDuration(
RECON_OM_SNAPSHOT_TASK_INTERVAL,
RECON_OM_SNAPSHOT_TASK_INTERVAL_DEFAULT,
OZONE_RECON_OM_SNAPSHOT_TASK_INTERVAL_DELAY,
configuration.get(
ReconServerConfigKeys.RECON_OM_SNAPSHOT_TASK_INTERVAL_DELAY,
OZONE_RECON_OM_SNAPSHOT_TASK_INTERVAL_DEFAULT),
TimeUnit.MILLISECONDS);
scheduler.scheduleWithFixedDelay(() -> {
try {
Expand Down
17 changes: 9 additions & 8 deletions ...n/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/PrometheusServiceProviderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
import java.util.TreeMap;
import java.util.concurrent.TimeUnit;

import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.RECON_METRICS_HTTP_CONNECTION_REQUEST_TIMEOUT;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.RECON_METRICS_HTTP_CONNECTION_REQUEST_TIMEOUT_DEFAULT;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.RECON_METRICS_HTTP_CONNECTION_TIMEOUT;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.RECON_METRICS_HTTP_CONNECTION_TIMEOUT_DEFAULT;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.OZONE_RECON_METRICS_HTTP_CONNECTION_REQUEST_TIMEOUT;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.OZONE_RECON_METRICS_HTTP_CONNECTION_REQUEST_TIMEOUT_DEFAULT;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.OZONE_RECON_METRICS_HTTP_CONNECTION_TIMEOUT;
import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.OZONE_RECON_METRICS_HTTP_CONNECTION_TIMEOUT_DEFAULT;

/**
* Implementation of the Prometheus Metrics Service provider.
Expand All @@ -64,11 +64,12 @@ public PrometheusServiceProviderImpl(OzoneConfiguration configuration,
ReconUtils reconUtils) {

int connectionTimeout = (int) configuration.getTimeDuration(
RECON_METRICS_HTTP_CONNECTION_TIMEOUT,
RECON_METRICS_HTTP_CONNECTION_TIMEOUT_DEFAULT, TimeUnit.MILLISECONDS);
OZONE_RECON_METRICS_HTTP_CONNECTION_TIMEOUT,
OZONE_RECON_METRICS_HTTP_CONNECTION_TIMEOUT_DEFAULT,
TimeUnit.MILLISECONDS);
int connectionRequestTimeout = (int) configuration.getTimeDuration(
RECON_METRICS_HTTP_CONNECTION_REQUEST_TIMEOUT,
RECON_METRICS_HTTP_CONNECTION_REQUEST_TIMEOUT_DEFAULT,
OZONE_RECON_METRICS_HTTP_CONNECTION_REQUEST_TIMEOUT,
OZONE_RECON_METRICS_HTTP_CONNECTION_REQUEST_TIMEOUT_DEFAULT,
TimeUnit.MILLISECONDS);

connectionFactory =
Expand Down