Skip to content

Commit 17d64ba

Browse files
authored
Revert "HDFS-16488. [SPS]: Expose metrics to JMX for external SPS (#4035)" (#4232)
1 parent acc0e0a commit 17d64ba

File tree

8 files changed

+5
-246
lines changed

8 files changed

+5
-246
lines changed

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/sps/BlockStorageMovementAttemptedItems.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -301,16 +301,6 @@ public int getAttemptedItemsCount() {
301301
}
302302
}
303303

304-
@VisibleForTesting
305-
public List<AttemptedItemInfo> getStorageMovementAttemptedItems() {
306-
return storageMovementAttemptedItems;
307-
}
308-
309-
@VisibleForTesting
310-
public BlockingQueue<Block> getMovementFinishedBlocks() {
311-
return movementFinishedBlocks;
312-
}
313-
314304
public void clearQueues() {
315305
movementFinishedBlocks.clear();
316306
synchronized (storageMovementAttemptedItems) {

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/sps/StoragePolicySatisfier.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1077,7 +1077,7 @@ public void clearQueues() {
10771077
* attempted or reported time stamp. This is used by
10781078
* {@link BlockStorageMovementAttemptedItems#storageMovementAttemptedItems}.
10791079
*/
1080-
public final static class AttemptedItemInfo extends ItemInfo {
1080+
final static class AttemptedItemInfo extends ItemInfo {
10811081
private long lastAttemptedOrReportedTime;
10821082
private final Set<Block> blocks;
10831083

@@ -1095,7 +1095,7 @@ public final static class AttemptedItemInfo extends ItemInfo {
10951095
* @param retryCount
10961096
* file retry count
10971097
*/
1098-
public AttemptedItemInfo(long rootId, long trackId,
1098+
AttemptedItemInfo(long rootId, long trackId,
10991099
long lastAttemptedOrReportedTime,
11001100
Set<Block> blocks, int retryCount) {
11011101
super(rootId, trackId, retryCount);

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/sps/ExternalSPSContext.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.util.List;
2525

2626
import org.apache.hadoop.classification.InterfaceAudience;
27-
import org.apache.hadoop.classification.VisibleForTesting;
2827
import org.apache.hadoop.fs.Path;
2928
import org.apache.hadoop.hdfs.DFSUtilClient;
3029
import org.apache.hadoop.hdfs.protocol.Block;
@@ -40,12 +39,10 @@
4039
import org.apache.hadoop.hdfs.server.namenode.sps.Context;
4140
import org.apache.hadoop.hdfs.server.namenode.sps.FileCollector;
4241
import org.apache.hadoop.hdfs.server.namenode.sps.SPSService;
43-
import org.apache.hadoop.hdfs.server.namenode.sps.StoragePolicySatisfier;
4442
import org.apache.hadoop.hdfs.server.namenode.sps.StoragePolicySatisfier.DatanodeMap;
4543
import org.apache.hadoop.hdfs.server.namenode.sps.StoragePolicySatisfier.DatanodeWithStorage;
4644
import org.apache.hadoop.hdfs.server.protocol.BlockStorageMovementCommand.BlockMovingInfo;
4745
import org.apache.hadoop.hdfs.server.protocol.DatanodeStorageReport;
48-
import org.apache.hadoop.hdfs.server.sps.metrics.ExternalSPSBeanMetrics;
4946
import org.apache.hadoop.net.NetworkTopology;
5047
import org.slf4j.Logger;
5148
import org.slf4j.LoggerFactory;
@@ -65,7 +62,6 @@ public class ExternalSPSContext implements Context {
6562
private final FileCollector fileCollector;
6663
private final BlockMoveTaskHandler externalHandler;
6764
private final BlockMovementListener blkMovementListener;
68-
private ExternalSPSBeanMetrics spsBeanMetrics;
6965

7066
public ExternalSPSContext(SPSService service, NameNodeConnector nnc) {
7167
this.service = service;
@@ -212,17 +208,4 @@ public void notifyMovementTriedBlocks(Block[] moveAttemptFinishedBlks) {
212208
LOG.info("Movement attempted blocks", actualBlockMovements);
213209
}
214210
}
215-
216-
public void initMetrics(StoragePolicySatisfier sps) {
217-
spsBeanMetrics = new ExternalSPSBeanMetrics(sps);
218-
}
219-
220-
public void closeMetrics() {
221-
spsBeanMetrics.close();
222-
}
223-
224-
@VisibleForTesting
225-
public ExternalSPSBeanMetrics getSpsBeanMetrics() {
226-
return spsBeanMetrics;
227-
}
228211
}

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/sps/ExternalStoragePolicySatisfier.java

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848
*/
4949
@InterfaceAudience.Private
5050
public final class ExternalStoragePolicySatisfier {
51-
public static final Logger LOG = LoggerFactory.getLogger(ExternalStoragePolicySatisfier.class);
51+
public static final Logger LOG = LoggerFactory
52+
.getLogger(ExternalStoragePolicySatisfier.class);
5253

5354
private ExternalStoragePolicySatisfier() {
5455
// This is just a class to start and run external sps.
@@ -59,7 +60,6 @@ private ExternalStoragePolicySatisfier() {
5960
*/
6061
public static void main(String[] args) throws Exception {
6162
NameNodeConnector nnc = null;
62-
ExternalSPSContext context = null;
6363
try {
6464
StringUtils.startupShutdownMessage(StoragePolicySatisfier.class, args,
6565
LOG);
@@ -69,10 +69,9 @@ public static void main(String[] args) throws Exception {
6969
StoragePolicySatisfier sps = new StoragePolicySatisfier(spsConf);
7070
nnc = getNameNodeConnector(spsConf);
7171

72-
context = new ExternalSPSContext(sps, nnc);
72+
ExternalSPSContext context = new ExternalSPSContext(sps, nnc);
7373
sps.init(context);
7474
sps.start(StoragePolicySatisfierMode.EXTERNAL);
75-
context.initMetrics(sps);
7675
if (sps != null) {
7776
sps.join();
7877
}
@@ -83,11 +82,6 @@ public static void main(String[] args) throws Exception {
8382
if (nnc != null) {
8483
nnc.close();
8584
}
86-
if (context!= null) {
87-
if (context.getSpsBeanMetrics() != null) {
88-
context.closeMetrics();
89-
}
90-
}
9185
}
9286
}
9387

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/sps/metrics/ExternalSPSBeanMetrics.java

Lines changed: 0 additions & 100 deletions
This file was deleted.

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/sps/metrics/ExternalSPSMXBean.java

Lines changed: 0 additions & 52 deletions
This file was deleted.

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/sps/metrics/package-info.java

Lines changed: 0 additions & 22 deletions
This file was deleted.

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/sps/TestExternalStoragePolicySatisfier.java

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import java.io.File;
4545
import java.io.FileNotFoundException;
4646
import java.io.IOException;
47-
import java.lang.management.ManagementFactory;
4847
import java.net.InetSocketAddress;
4948
import java.security.PrivilegedExceptionAction;
5049
import java.util.ArrayList;
@@ -85,7 +84,6 @@
8584
import org.apache.hadoop.hdfs.server.namenode.sps.BlockMovementListener;
8685
import org.apache.hadoop.hdfs.server.namenode.sps.BlockStorageMovementAttemptedItems;
8786
import org.apache.hadoop.hdfs.server.namenode.sps.StoragePolicySatisfier;
88-
import org.apache.hadoop.hdfs.server.sps.metrics.ExternalSPSBeanMetrics;
8987
import org.apache.hadoop.http.HttpConfig;
9088
import org.apache.hadoop.minikdc.MiniKdc;
9189
import org.apache.hadoop.security.SecurityUtil;
@@ -104,8 +102,6 @@
104102
import org.slf4j.Logger;
105103
import org.slf4j.LoggerFactory;
106104

107-
import javax.management.MBeanServer;
108-
import javax.management.ObjectName;
109105
import java.util.function.Supplier;
110106

111107
/**
@@ -1821,34 +1817,4 @@ public void clear() {
18211817
actualBlockMovements.clear();
18221818
}
18231819
}
1824-
1825-
@Test(timeout = 300000)
1826-
public void testExternalSPSMetrics() throws Exception {
1827-
try {
1828-
createCluster();
1829-
// Start JMX but stop SPS thread to prevent mock data from being consumed.
1830-
externalSps.stop(true);
1831-
externalCtxt.initMetrics(externalSps);
1832-
1833-
ExternalSPSBeanMetrics spsBeanMetrics = externalCtxt.getSpsBeanMetrics();
1834-
MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
1835-
ObjectName mxBeanName = new ObjectName("Hadoop:service=ExternalSPS,name=ExternalSPS");
1836-
// Assert metrics before update.
1837-
assertEquals(0, mbs.getAttribute(mxBeanName, "AttemptedItemsCount"));
1838-
assertEquals(0, mbs.getAttribute(mxBeanName, "ProcessingQueueSize"));
1839-
assertEquals(0, mbs.getAttribute(mxBeanName, "MovementFinishedBlocksCount"));
1840-
1841-
// Update metrics.
1842-
spsBeanMetrics.updateAttemptedItemsCount();
1843-
spsBeanMetrics.updateProcessingQueueSize();
1844-
spsBeanMetrics.updateMovementFinishedBlocksCount();
1845-
1846-
// Assert metrics after update.
1847-
assertEquals(1, mbs.getAttribute(mxBeanName, "AttemptedItemsCount"));
1848-
assertEquals(1, mbs.getAttribute(mxBeanName, "ProcessingQueueSize"));
1849-
assertEquals(1, mbs.getAttribute(mxBeanName, "MovementFinishedBlocksCount"));
1850-
} finally {
1851-
shutdownCluster();
1852-
}
1853-
}
18541820
}

0 commit comments

Comments
 (0)