From 7b4c2eca4aacbbdf2f845303f507c94211b9f3e8 Mon Sep 17 00:00:00 2001 From: zwangsheng <2213335496@qq.com> Date: Wed, 3 Aug 2022 14:51:22 +0800 Subject: [PATCH] remove useless server id --- .../org/apache/uniffle/server/ShuffleServer.java | 2 +- .../server/storage/StorageManagerFactory.java | 2 +- .../uniffle/server/ShuffleFlushManagerTest.java | 12 ++++++------ .../server/buffer/ShuffleBufferManagerTest.java | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/server/src/main/java/org/apache/uniffle/server/ShuffleServer.java b/server/src/main/java/org/apache/uniffle/server/ShuffleServer.java index 0cae0cf530..4194bb0ae1 100644 --- a/server/src/main/java/org/apache/uniffle/server/ShuffleServer.java +++ b/server/src/main/java/org/apache/uniffle/server/ShuffleServer.java @@ -144,7 +144,7 @@ private void initialization() throws Exception { jettyServer = new JettyServer(shuffleServerConf); registerMetrics(); - storageManager = StorageManagerFactory.getInstance().createStorageManager(id, shuffleServerConf); + storageManager = StorageManagerFactory.getInstance().createStorageManager(shuffleServerConf); storageManager.start(); diff --git a/server/src/main/java/org/apache/uniffle/server/storage/StorageManagerFactory.java b/server/src/main/java/org/apache/uniffle/server/storage/StorageManagerFactory.java index b461accd1f..209a9de44f 100644 --- a/server/src/main/java/org/apache/uniffle/server/storage/StorageManagerFactory.java +++ b/server/src/main/java/org/apache/uniffle/server/storage/StorageManagerFactory.java @@ -30,7 +30,7 @@ public static StorageManagerFactory getInstance() { return LazyHolder.INSTANCE; } - public StorageManager createStorageManager(String serverId, ShuffleServerConf conf) { + public StorageManager createStorageManager(ShuffleServerConf conf) { StorageType type = StorageType.valueOf(conf.get(ShuffleServerConf.RSS_STORAGE_TYPE)); if (StorageType.LOCALFILE.equals(type) || StorageType.MEMORY_LOCALFILE.equals(type)) { return new LocalStorageManager(conf); diff --git a/server/src/test/java/org/apache/uniffle/server/ShuffleFlushManagerTest.java b/server/src/test/java/org/apache/uniffle/server/ShuffleFlushManagerTest.java index 2da9b4e753..d137d5f9fc 100644 --- a/server/src/test/java/org/apache/uniffle/server/ShuffleFlushManagerTest.java +++ b/server/src/test/java/org/apache/uniffle/server/ShuffleFlushManagerTest.java @@ -86,7 +86,7 @@ public void hadoopConfTest() { shuffleServerConf.setString("rss.server.hadoop.dfs.replication", "2"); shuffleServerConf.setString("rss.server.hadoop.a.b", "value"); StorageManager storageManager = - StorageManagerFactory.getInstance().createStorageManager("shuffleServerId", shuffleServerConf); + StorageManagerFactory.getInstance().createStorageManager(shuffleServerConf); ShuffleFlushManager manager = new ShuffleFlushManager(shuffleServerConf, "shuffleServerId", null, storageManager); assertEquals("2", manager.getHadoopConf().get("dfs.replication")); @@ -97,7 +97,7 @@ public void hadoopConfTest() { public void writeTest() throws Exception { String appId = "writeTest_appId"; StorageManager storageManager = - StorageManagerFactory.getInstance().createStorageManager("shuffleServerId", shuffleServerConf); + StorageManagerFactory.getInstance().createStorageManager(shuffleServerConf); storageManager.registerRemoteStorage(appId, remoteStorage); storageManager.registerRemoteStorage(appId, remoteStorage); String storageHost = "localhost"; @@ -145,7 +145,7 @@ public void writeTest() throws Exception { public void complexWriteTest() throws Exception { shuffleServerConf.setString("rss.server.flush.handler.expired", "3"); StorageManager storageManager = - StorageManagerFactory.getInstance().createStorageManager("shuffleServerId", shuffleServerConf); + StorageManagerFactory.getInstance().createStorageManager(shuffleServerConf); String appId = "complexWriteTest_appId"; storageManager.registerRemoteStorage(appId, remoteStorage); List expectedBlocks = Lists.newArrayList(); @@ -183,7 +183,7 @@ public void complexWriteTest() throws Exception { @Test public void clearTest() throws Exception { StorageManager storageManager = - StorageManagerFactory.getInstance().createStorageManager("shuffleServerId", shuffleServerConf); + StorageManagerFactory.getInstance().createStorageManager(shuffleServerConf); String appId1 = "complexWriteTest_appId1"; String appId2 = "complexWriteTest_appId2"; storageManager.registerRemoteStorage(appId1, remoteStorage); @@ -240,7 +240,7 @@ public void clearLocalTest(@TempDir File tempDir) throws Exception { serverConf.setString(ShuffleServerConf.RSS_STORAGE_TYPE, StorageType.LOCALFILE.name()); serverConf.setLong(ShuffleServerConf.DISK_CAPACITY, 1024L * 1024L * 1024L); StorageManager storageManager = - StorageManagerFactory.getInstance().createStorageManager("shuffleServerId", serverConf); + StorageManagerFactory.getInstance().createStorageManager(serverConf); ShuffleFlushManager manager = new ShuffleFlushManager(serverConf, "shuffleServerId", null, storageManager); ShuffleDataFlushEvent event1 = @@ -385,7 +385,7 @@ public void processPendingEventsTest(@TempDir File tempDir) { shuffleServerConf.set(ShuffleServerConf.DISK_CAPACITY, 100L); shuffleServerConf.set(ShuffleServerConf.PENDING_EVENT_TIMEOUT_SEC, 5L); StorageManager storageManager = - StorageManagerFactory.getInstance().createStorageManager("shuffleServerId", shuffleServerConf); + StorageManagerFactory.getInstance().createStorageManager(shuffleServerConf); ShuffleFlushManager manager = new ShuffleFlushManager(shuffleServerConf, "shuffleServerId", null, storageManager); ShuffleDataFlushEvent event = new ShuffleDataFlushEvent(1, "1", 1, 1,1, 100, null, null, null); diff --git a/server/src/test/java/org/apache/uniffle/server/buffer/ShuffleBufferManagerTest.java b/server/src/test/java/org/apache/uniffle/server/buffer/ShuffleBufferManagerTest.java index 6815161871..ecd4d433f1 100644 --- a/server/src/test/java/org/apache/uniffle/server/buffer/ShuffleBufferManagerTest.java +++ b/server/src/test/java/org/apache/uniffle/server/buffer/ShuffleBufferManagerTest.java @@ -329,7 +329,7 @@ public void cacheShuffleDataWithPreAllocationTest() { @Test public void bufferSizeTest() throws Exception { ShuffleServer mockShuffleServer = mock(ShuffleServer.class); - StorageManager storageManager = StorageManagerFactory.getInstance().createStorageManager("serverId", conf); + StorageManager storageManager = StorageManagerFactory.getInstance().createStorageManager(conf); ShuffleFlushManager shuffleFlushManager = new ShuffleFlushManager(conf, "serverId", mockShuffleServer, storageManager); shuffleBufferManager = new ShuffleBufferManager(conf, shuffleFlushManager);