diff --git a/client-spark/spark-3/src/main/scala/org/apache/spark/shuffle/celeborn/CelebornShuffleReader.scala b/client-spark/spark-3/src/main/scala/org/apache/spark/shuffle/celeborn/CelebornShuffleReader.scala index 74a4daeb0..402604439 100644 --- a/client-spark/spark-3/src/main/scala/org/apache/spark/shuffle/celeborn/CelebornShuffleReader.scala +++ b/client-spark/spark-3/src/main/scala/org/apache/spark/shuffle/celeborn/CelebornShuffleReader.scala @@ -41,7 +41,7 @@ import org.apache.celeborn.common.network.client.TransportClient import org.apache.celeborn.common.network.protocol.TransportMessage import org.apache.celeborn.common.protocol.{MessageType, PartitionLocation, PbOpenStreamList, PbOpenStreamListResponse, PbStreamHandler} import org.apache.celeborn.common.protocol.message.StatusCode -import org.apache.celeborn.common.util.{ExceptionMaker, JavaUtils, ThreadUtils, Utils} +import org.apache.celeborn.common.util.{JavaUtils, ThreadUtils, Utils} class CelebornShuffleReader[K, C]( handle: CelebornShuffleHandle[K, _, C], diff --git a/client/src/main/scala/org/apache/celeborn/client/ChangePartitionManager.scala b/client/src/main/scala/org/apache/celeborn/client/ChangePartitionManager.scala index d8cfa655d..c08c967c3 100644 --- a/client/src/main/scala/org/apache/celeborn/client/ChangePartitionManager.scala +++ b/client/src/main/scala/org/apache/celeborn/client/ChangePartitionManager.scala @@ -29,7 +29,7 @@ import org.apache.celeborn.common.meta.WorkerInfo import org.apache.celeborn.common.protocol.PartitionLocation import org.apache.celeborn.common.protocol.message.ControlMessages.WorkerResource import org.apache.celeborn.common.protocol.message.StatusCode -import org.apache.celeborn.common.util.{JavaUtils, ThreadUtils, Utils} +import org.apache.celeborn.common.util.{JavaUtils, ThreadUtils} case class ChangePartitionRequest( context: RequestLocationCallContext, diff --git a/client/src/main/scala/org/apache/celeborn/client/LifecycleManager.scala b/client/src/main/scala/org/apache/celeborn/client/LifecycleManager.scala index 566e1bf34..69a4e1b40 100644 --- a/client/src/main/scala/org/apache/celeborn/client/LifecycleManager.scala +++ b/client/src/main/scala/org/apache/celeborn/client/LifecycleManager.scala @@ -237,8 +237,6 @@ class LifecycleManager(val appUniqueId: String, val conf: CelebornConf) extends } override def onStop(): Unit = { - import scala.concurrent.duration._ - checkForShuffleRemoval.cancel(true) ThreadUtils.shutdown(forwardMessageThread) diff --git a/client/src/main/scala/org/apache/celeborn/client/commit/CommitHandler.scala b/client/src/main/scala/org/apache/celeborn/client/commit/CommitHandler.scala index 8532599bd..8cc81972c 100644 --- a/client/src/main/scala/org/apache/celeborn/client/commit/CommitHandler.scala +++ b/client/src/main/scala/org/apache/celeborn/client/commit/CommitHandler.scala @@ -37,8 +37,8 @@ import org.apache.celeborn.common.meta.{ShufflePartitionLocationInfo, WorkerInfo import org.apache.celeborn.common.protocol.{PartitionLocation, PartitionType} import org.apache.celeborn.common.protocol.message.ControlMessages.{CommitFiles, CommitFilesResponse} import org.apache.celeborn.common.protocol.message.StatusCode -import org.apache.celeborn.common.rpc.{RpcCallContext, RpcEndpointRef} -import org.apache.celeborn.common.util.{CollectionUtils, JavaUtils, ThreadUtils, Utils} +import org.apache.celeborn.common.rpc.RpcCallContext +import org.apache.celeborn.common.util.{CollectionUtils, JavaUtils, Utils} // Can Remove this if celeborn don't support scala211 in future import org.apache.celeborn.common.util.FunctionConverter._ import org.apache.celeborn.common.util.ThreadUtils.awaitResult diff --git a/common/src/main/scala/org/apache/celeborn/common/CelebornConf.scala b/common/src/main/scala/org/apache/celeborn/common/CelebornConf.scala index 1730e411a..a5cd18b3c 100644 --- a/common/src/main/scala/org/apache/celeborn/common/CelebornConf.scala +++ b/common/src/main/scala/org/apache/celeborn/common/CelebornConf.scala @@ -33,7 +33,7 @@ import org.apache.celeborn.common.internal.Logging import org.apache.celeborn.common.internal.config._ import org.apache.celeborn.common.network.util.ByteUnit import org.apache.celeborn.common.protocol._ -import org.apache.celeborn.common.protocol.StorageInfo.{typesMap, validate, Type} +import org.apache.celeborn.common.protocol.StorageInfo.Type import org.apache.celeborn.common.protocol.StorageInfo.Type.{HDD, SSD} import org.apache.celeborn.common.rpc.RpcTimeout import org.apache.celeborn.common.util.{JavaUtils, Utils} diff --git a/common/src/main/scala/org/apache/celeborn/common/client/StaticMasterEndpointResolver.scala b/common/src/main/scala/org/apache/celeborn/common/client/StaticMasterEndpointResolver.scala index 88f8352e5..f57374dba 100644 --- a/common/src/main/scala/org/apache/celeborn/common/client/StaticMasterEndpointResolver.scala +++ b/common/src/main/scala/org/apache/celeborn/common/client/StaticMasterEndpointResolver.scala @@ -17,9 +17,6 @@ package org.apache.celeborn.common.client -import java.util - -import scala.collection.JavaConverters._ import scala.util.Random import org.apache.celeborn.common.CelebornConf diff --git a/common/src/main/scala/org/apache/celeborn/common/meta/DeviceInfo.scala b/common/src/main/scala/org/apache/celeborn/common/meta/DeviceInfo.scala index 29971c3cf..de57b0630 100644 --- a/common/src/main/scala/org/apache/celeborn/common/meta/DeviceInfo.scala +++ b/common/src/main/scala/org/apache/celeborn/common/meta/DeviceInfo.scala @@ -19,7 +19,6 @@ package org.apache.celeborn.common.meta import java.io.File import java.util -import java.util.function.BiFunction import scala.collection.JavaConverters._ import scala.collection.mutable.ListBuffer diff --git a/common/src/main/scala/org/apache/celeborn/common/rpc/netty/NettyRpcEnv.scala b/common/src/main/scala/org/apache/celeborn/common/rpc/netty/NettyRpcEnv.scala index 67732620d..27b9e53c3 100644 --- a/common/src/main/scala/org/apache/celeborn/common/rpc/netty/NettyRpcEnv.scala +++ b/common/src/main/scala/org/apache/celeborn/common/rpc/netty/NettyRpcEnv.scala @@ -38,7 +38,7 @@ import org.apache.celeborn.common.network.protocol.{RequestMessage => NRequestMe import org.apache.celeborn.common.network.sasl.{SaslClientBootstrap, SaslServerBootstrap} import org.apache.celeborn.common.network.sasl.registration.{RegistrationClientBootstrap, RegistrationServerBootstrap} import org.apache.celeborn.common.network.server._ -import org.apache.celeborn.common.protocol.{RpcNameConstants, TransportModuleConstants} +import org.apache.celeborn.common.protocol.RpcNameConstants import org.apache.celeborn.common.rpc._ import org.apache.celeborn.common.serializer.{JavaSerializer, JavaSerializerInstance, SerializationStream} import org.apache.celeborn.common.util.{ByteBufferInputStream, ByteBufferOutputStream, JavaUtils, ThreadUtils, Utils} diff --git a/common/src/main/scala/org/apache/celeborn/common/util/CelebornHadoopUtils.scala b/common/src/main/scala/org/apache/celeborn/common/util/CelebornHadoopUtils.scala index cf15709a7..356711d75 100644 --- a/common/src/main/scala/org/apache/celeborn/common/util/CelebornHadoopUtils.scala +++ b/common/src/main/scala/org/apache/celeborn/common/util/CelebornHadoopUtils.scala @@ -20,8 +20,6 @@ package org.apache.celeborn.common.util import java.io.{File, IOException} import java.util.concurrent.atomic.AtomicBoolean -import scala.collection.JavaConverters._ - import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.{FileSystem, Path} import org.apache.hadoop.security.UserGroupInformation diff --git a/common/src/main/scala/org/apache/celeborn/common/util/ThreadUtils.scala b/common/src/main/scala/org/apache/celeborn/common/util/ThreadUtils.scala index caa3719a4..6374de1b7 100644 --- a/common/src/main/scala/org/apache/celeborn/common/util/ThreadUtils.scala +++ b/common/src/main/scala/org/apache/celeborn/common/util/ThreadUtils.scala @@ -23,10 +23,9 @@ import java.util.concurrent.locks.ReentrantLock import scala.concurrent.{Awaitable, ExecutionContext, ExecutionContextExecutor, Future} import scala.concurrent.duration.{Duration, DurationInt, FiniteDuration} -import scala.language.higherKinds import scala.util.control.NonFatal -import com.google.common.util.concurrent.{MoreExecutors, ThreadFactoryBuilder} +import com.google.common.util.concurrent.ThreadFactoryBuilder import org.apache.celeborn.common.exception.CelebornException import org.apache.celeborn.common.internal.Logging diff --git a/common/src/test/scala/org/apache/celeborn/common/CelebornConfSuite.scala b/common/src/test/scala/org/apache/celeborn/common/CelebornConfSuite.scala index fd1e00f05..62d8d42ca 100644 --- a/common/src/test/scala/org/apache/celeborn/common/CelebornConfSuite.scala +++ b/common/src/test/scala/org/apache/celeborn/common/CelebornConfSuite.scala @@ -21,7 +21,6 @@ import org.apache.celeborn.CelebornFunSuite import org.apache.celeborn.common.CelebornConf._ import org.apache.celeborn.common.internal.config.ConfigEntry import org.apache.celeborn.common.protocol.StorageInfo -import org.apache.celeborn.common.util.Utils class CelebornConfSuite extends CelebornFunSuite { diff --git a/common/src/test/scala/org/apache/celeborn/common/client/MasterEndpointResolverSuite.scala b/common/src/test/scala/org/apache/celeborn/common/client/MasterEndpointResolverSuite.scala index c89c9ac07..aab55c83e 100644 --- a/common/src/test/scala/org/apache/celeborn/common/client/MasterEndpointResolverSuite.scala +++ b/common/src/test/scala/org/apache/celeborn/common/client/MasterEndpointResolverSuite.scala @@ -17,10 +17,6 @@ package org.apache.celeborn.common.client -import java.util - -import scala.collection.JavaConverters._ - import org.apache.celeborn.CelebornFunSuite import org.apache.celeborn.common.CelebornConf import org.apache.celeborn.common.protocol.RpcNameConstants diff --git a/common/src/test/scala/org/apache/celeborn/common/rpc/netty/NettyRpcEnvSuite.scala b/common/src/test/scala/org/apache/celeborn/common/rpc/netty/NettyRpcEnvSuite.scala index a7b1fbfa4..8b0ba7bcd 100644 --- a/common/src/test/scala/org/apache/celeborn/common/rpc/netty/NettyRpcEnvSuite.scala +++ b/common/src/test/scala/org/apache/celeborn/common/rpc/netty/NettyRpcEnvSuite.scala @@ -29,7 +29,6 @@ import org.apache.celeborn.common.exception.CelebornException import org.apache.celeborn.common.network.client.TransportClient import org.apache.celeborn.common.protocol.TransportModuleConstants import org.apache.celeborn.common.rpc._ -import org.apache.celeborn.common.util.ThreadUtils class NettyRpcEnvSuite extends RpcEnvSuite with TimeLimits { diff --git a/common/src/test/scala/org/apache/celeborn/common/rpc/netty/SSLNettyRpcEnvSuite.scala b/common/src/test/scala/org/apache/celeborn/common/rpc/netty/SSLNettyRpcEnvSuite.scala index dbbf465fc..2e9cf99e4 100644 --- a/common/src/test/scala/org/apache/celeborn/common/rpc/netty/SSLNettyRpcEnvSuite.scala +++ b/common/src/test/scala/org/apache/celeborn/common/rpc/netty/SSLNettyRpcEnvSuite.scala @@ -20,7 +20,6 @@ package org.apache.celeborn.common.rpc.netty import org.apache.celeborn.common.CelebornConf import org.apache.celeborn.common.network.TestHelper import org.apache.celeborn.common.network.ssl.SslSampleConfigs -import org.apache.celeborn.common.protocol.TransportModuleConstants class SSLNettyRpcEnvSuite extends NettyRpcEnvSuite { diff --git a/common/src/test/scala/org/apache/celeborn/common/util/PbSerDeUtilsTest.scala b/common/src/test/scala/org/apache/celeborn/common/util/PbSerDeUtilsTest.scala index 184d49d14..ac6d89088 100644 --- a/common/src/test/scala/org/apache/celeborn/common/util/PbSerDeUtilsTest.scala +++ b/common/src/test/scala/org/apache/celeborn/common/util/PbSerDeUtilsTest.scala @@ -27,7 +27,7 @@ import org.apache.hadoop.shaded.org.apache.commons.lang3.RandomStringUtils import org.apache.celeborn.CelebornFunSuite import org.apache.celeborn.common.identity.UserIdentifier -import org.apache.celeborn.common.meta.{ApplicationMeta, DeviceInfo, DiskFileInfo, DiskInfo, FileInfo, ReduceFileMeta, WorkerEventInfo, WorkerInfo, WorkerStatus} +import org.apache.celeborn.common.meta.{ApplicationMeta, DeviceInfo, DiskFileInfo, DiskInfo, ReduceFileMeta, WorkerEventInfo, WorkerInfo, WorkerStatus} import org.apache.celeborn.common.protocol.{PartitionLocation, PbPackedWorkerResource, PbWorkerResource, StorageInfo} import org.apache.celeborn.common.protocol.message.ControlMessages.WorkerResource import org.apache.celeborn.common.quota.ResourceConsumption diff --git a/master/src/main/scala/org/apache/celeborn/service/deploy/master/Master.scala b/master/src/main/scala/org/apache/celeborn/service/deploy/master/Master.scala index bf9b5ba2d..a2849abc7 100644 --- a/master/src/main/scala/org/apache/celeborn/service/deploy/master/Master.scala +++ b/master/src/main/scala/org/apache/celeborn/service/deploy/master/Master.scala @@ -20,7 +20,7 @@ package org.apache.celeborn.service.deploy.master import java.io.IOException import java.net.BindException import java.util -import java.util.concurrent.{ConcurrentHashMap, ExecutorService, ScheduledFuture, TimeUnit} +import java.util.concurrent.{ExecutorService, ScheduledFuture, TimeUnit} import java.util.concurrent.atomic.AtomicBoolean import java.util.function.ToLongFunction @@ -43,12 +43,12 @@ import org.apache.celeborn.common.metrics.source.{JVMCPUSource, JVMSource, Resou import org.apache.celeborn.common.network.CelebornRackResolver import org.apache.celeborn.common.network.protocol.TransportMessage import org.apache.celeborn.common.protocol._ -import org.apache.celeborn.common.protocol.message.{ControlMessages, StatusCode} import org.apache.celeborn.common.protocol.message.ControlMessages._ +import org.apache.celeborn.common.protocol.message.StatusCode import org.apache.celeborn.common.quota.ResourceConsumption import org.apache.celeborn.common.rpc._ import org.apache.celeborn.common.rpc.{RpcSecurityContextBuilder, ServerSaslContextBuilder} -import org.apache.celeborn.common.util.{CelebornHadoopUtils, CollectionUtils, JavaUtils, PbSerDeUtils, SignalUtils, ThreadUtils, Utils} +import org.apache.celeborn.common.util.{CelebornHadoopUtils, JavaUtils, PbSerDeUtils, SignalUtils, ThreadUtils, Utils} import org.apache.celeborn.server.common.{HttpService, Service} import org.apache.celeborn.service.deploy.master.clustermeta.SingleMasterMetaManager import org.apache.celeborn.service.deploy.master.clustermeta.ha.{HAHelper, HAMasterMetaManager, MetaHandler} diff --git a/master/src/test/scala/org/apache/celeborn/service/deploy/master/MasterSuite.scala b/master/src/test/scala/org/apache/celeborn/service/deploy/master/MasterSuite.scala index 224ae89ba..c1f209f81 100644 --- a/master/src/test/scala/org/apache/celeborn/service/deploy/master/MasterSuite.scala +++ b/master/src/test/scala/org/apache/celeborn/service/deploy/master/MasterSuite.scala @@ -19,14 +19,13 @@ package org.apache.celeborn.service.deploy.master import java.nio.file.Files -import org.mockito.Mockito.{mock, times, verify} +import org.mockito.Mockito.mock import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach} import org.scalatest.funsuite.AnyFunSuite import org.apache.celeborn.common.CelebornConf import org.apache.celeborn.common.internal.Logging import org.apache.celeborn.common.protocol.{PbCheckForWorkerTimeout, PbRegisterWorker} -import org.apache.celeborn.common.protocol.message.ControlMessages.{ApplicationLost, HeartbeatFromApplication} import org.apache.celeborn.common.util.{CelebornExitKind, Utils} class MasterSuite extends AnyFunSuite diff --git a/pom.xml b/pom.xml index f123201f8..ad9212742 100644 --- a/pom.xml +++ b/pom.xml @@ -958,12 +958,14 @@ ${maven.plugin.scala.version} + -Ywarn-unused-import -unchecked -deprecation -feature -explaintypes -Xfatal-warnings -P:silencer:globalFilters=.*deprecated.* + -P:silencer:lineContentFilters=.*FunctionConverter.* diff --git a/service/src/main/scala/org/apache/celeborn/server/common/http/authentication/AuthenticationFilter.scala b/service/src/main/scala/org/apache/celeborn/server/common/http/authentication/AuthenticationFilter.scala index b90412ff4..f2a3a0709 100644 --- a/service/src/main/scala/org/apache/celeborn/server/common/http/authentication/AuthenticationFilter.scala +++ b/service/src/main/scala/org/apache/celeborn/server/common/http/authentication/AuthenticationFilter.scala @@ -27,7 +27,7 @@ import scala.collection.mutable import org.apache.celeborn.common.CelebornConf import org.apache.celeborn.common.authentication.HttpAuthSchemes -import org.apache.celeborn.common.authentication.HttpAuthSchemes.{HttpAuthScheme, _} +import org.apache.celeborn.common.authentication.HttpAuthSchemes.HttpAuthScheme import org.apache.celeborn.common.internal.Logging import org.apache.celeborn.server.common.Service import org.apache.celeborn.server.common.http.HttpAuthUtils.AUTHORIZATION_HEADER diff --git a/tests/kubernetes-it/src/test/scala/org.apache.celeborn.integration/DeploySuite.scala b/tests/kubernetes-it/src/test/scala/org.apache.celeborn.integration/DeploySuite.scala index 7d93d6d06..8354d4933 100644 --- a/tests/kubernetes-it/src/test/scala/org.apache.celeborn.integration/DeploySuite.scala +++ b/tests/kubernetes-it/src/test/scala/org.apache.celeborn.integration/DeploySuite.scala @@ -24,7 +24,6 @@ import org.scalatest.concurrent.Waiters.{interval, timeout} import org.scalatest.time.SpanSugar.convertIntToGrainOfTime import org.apache.celeborn.CelebornFunSuite -import org.apache.celeborn.client.WithShuffleClientSuite // TODO need add shuffle client test class DeploySuite extends CelebornFunSuite with WithMiniKube { diff --git a/tests/spark-it/src/test/scala/org/apache/celeborn/tests/client/LifecycleManagerCommitFilesSuite.scala b/tests/spark-it/src/test/scala/org/apache/celeborn/tests/client/LifecycleManagerCommitFilesSuite.scala index 0d73d88b8..8bdc4beeb 100644 --- a/tests/spark-it/src/test/scala/org/apache/celeborn/tests/client/LifecycleManagerCommitFilesSuite.scala +++ b/tests/spark-it/src/test/scala/org/apache/celeborn/tests/client/LifecycleManagerCommitFilesSuite.scala @@ -26,9 +26,8 @@ import org.apache.celeborn.client.{LifecycleManager, WithShuffleClientSuite} import org.apache.celeborn.client.LifecycleManager.ShuffleFailedWorkers import org.apache.celeborn.client.commit.CommitFilesParam import org.apache.celeborn.common.CelebornConf -import org.apache.celeborn.common.protocol.message.ControlMessages.WorkerResource import org.apache.celeborn.common.protocol.message.StatusCode -import org.apache.celeborn.common.util.{CelebornExitKind, Utils} +import org.apache.celeborn.common.util.Utils import org.apache.celeborn.service.deploy.MiniClusterFeature import org.apache.celeborn.service.deploy.worker.CommitInfo diff --git a/tests/spark-it/src/test/scala/org/apache/celeborn/tests/client/LifecycleManagerSuite.scala b/tests/spark-it/src/test/scala/org/apache/celeborn/tests/client/LifecycleManagerSuite.scala index 1bcedc75f..87b05c766 100644 --- a/tests/spark-it/src/test/scala/org/apache/celeborn/tests/client/LifecycleManagerSuite.scala +++ b/tests/spark-it/src/test/scala/org/apache/celeborn/tests/client/LifecycleManagerSuite.scala @@ -19,8 +19,6 @@ package org.apache.celeborn.tests.client import java.util -import scala.collection.JavaConverters._ - import org.apache.celeborn.client.{LifecycleManager, WithShuffleClientSuite} import org.apache.celeborn.common.CelebornConf import org.apache.celeborn.common.protocol.message.StatusCode diff --git a/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/Controller.scala b/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/Controller.scala index e59014120..0f7059cbe 100644 --- a/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/Controller.scala +++ b/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/Controller.scala @@ -31,7 +31,7 @@ import org.roaringbitmap.RoaringBitmap import org.apache.celeborn.common.CelebornConf import org.apache.celeborn.common.identity.UserIdentifier import org.apache.celeborn.common.internal.Logging -import org.apache.celeborn.common.meta.{ReduceFileMeta, WorkerInfo, WorkerPartitionLocationInfo} +import org.apache.celeborn.common.meta.{WorkerInfo, WorkerPartitionLocationInfo} import org.apache.celeborn.common.metrics.MetricsSystem import org.apache.celeborn.common.protocol.{PartitionLocation, PartitionSplitMode, PartitionType, StorageInfo} import org.apache.celeborn.common.protocol.message.ControlMessages._ diff --git a/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/FetchHandler.scala b/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/FetchHandler.scala index dc4f27bdf..4d7e53895 100644 --- a/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/FetchHandler.scala +++ b/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/FetchHandler.scala @@ -20,12 +20,9 @@ package org.apache.celeborn.service.deploy.worker import java.io.{FileNotFoundException, IOException} import java.nio.charset.StandardCharsets import java.util -import java.util.concurrent.{Future => JFuture} import java.util.concurrent.atomic.AtomicBoolean import java.util.function.Consumer -import scala.collection.JavaConverters._ - import com.google.common.base.Throwables import com.google.protobuf.GeneratedMessageV3 import io.netty.util.concurrent.{Future, GenericFutureListener} diff --git a/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/PushDataHandler.scala b/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/PushDataHandler.scala index 7024f4fcd..421e5ddfd 100644 --- a/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/PushDataHandler.scala +++ b/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/PushDataHandler.scala @@ -26,13 +26,12 @@ import scala.concurrent.{Await, Promise} import scala.concurrent.duration.Duration import scala.util.{Failure, Success, Try} -import com.google.common.base.Throwables import com.google.protobuf.GeneratedMessageV3 import io.netty.buffer.ByteBuf import org.apache.celeborn.common.exception.{AlreadyClosedException, CelebornIOException} import org.apache.celeborn.common.internal.Logging -import org.apache.celeborn.common.meta.{DiskFileInfo, DiskStatus, WorkerInfo, WorkerPartitionLocationInfo} +import org.apache.celeborn.common.meta.{DiskStatus, WorkerInfo, WorkerPartitionLocationInfo} import org.apache.celeborn.common.metrics.source.Source import org.apache.celeborn.common.network.buffer.{NettyManagedBuffer, NioManagedBuffer} import org.apache.celeborn.common.network.client.{RpcResponseCallback, TransportClient, TransportClientFactory} diff --git a/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/WorkerStatusManager.scala b/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/WorkerStatusManager.scala index 61002b06f..f45038599 100644 --- a/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/WorkerStatusManager.scala +++ b/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/WorkerStatusManager.scala @@ -27,8 +27,8 @@ import com.google.common.collect.Sets import org.apache.celeborn.common.CelebornConf import org.apache.celeborn.common.internal.Logging import org.apache.celeborn.common.meta.WorkerStatus -import org.apache.celeborn.common.protocol.{PbWorkerStatus, WorkerEventType} import org.apache.celeborn.common.protocol.PbWorkerStatus.State +import org.apache.celeborn.common.protocol.WorkerEventType import org.apache.celeborn.service.deploy.worker.storage.StorageManager private[celeborn] class WorkerStatusManager(conf: CelebornConf) extends Logging { diff --git a/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/storage/Flusher.scala b/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/storage/Flusher.scala index 30194aa83..977b3b72f 100644 --- a/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/storage/Flusher.scala +++ b/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/storage/Flusher.scala @@ -18,14 +18,12 @@ package org.apache.celeborn.service.deploy.worker.storage import java.io.IOException -import java.nio.channels.ClosedByInterruptException import java.util.concurrent.{ExecutorService, LinkedBlockingQueue, TimeUnit} import java.util.concurrent.atomic.{AtomicBoolean, AtomicLongArray} -import scala.collection.JavaConverters._ import scala.util.Random -import io.netty.buffer.{CompositeByteBuf, PooledByteBufAllocator, Unpooled} +import io.netty.buffer.{CompositeByteBuf, PooledByteBufAllocator} import org.apache.celeborn.common.internal.Logging import org.apache.celeborn.common.meta.{DiskStatus, TimeWindow} diff --git a/worker/src/test/scala/org/apache/celeborn/service/deploy/MiniClusterFeature.scala b/worker/src/test/scala/org/apache/celeborn/service/deploy/MiniClusterFeature.scala index 1f20b71b6..fb6bd67f6 100644 --- a/worker/src/test/scala/org/apache/celeborn/service/deploy/MiniClusterFeature.scala +++ b/worker/src/test/scala/org/apache/celeborn/service/deploy/MiniClusterFeature.scala @@ -21,7 +21,7 @@ import java.io.IOException import java.net.BindException import java.nio.file.Files import java.util.concurrent.TimeUnit -import java.util.concurrent.locks.{Lock, ReentrantLock} +import java.util.concurrent.locks.ReentrantLock import scala.collection.mutable diff --git a/worker/src/test/scala/org/apache/celeborn/service/deploy/worker/storage/ApiWorkerResourceAuthenticationSuite.scala b/worker/src/test/scala/org/apache/celeborn/service/deploy/worker/storage/ApiWorkerResourceAuthenticationSuite.scala index 36ea0708f..8f0a862e6 100644 --- a/worker/src/test/scala/org/apache/celeborn/service/deploy/worker/storage/ApiWorkerResourceAuthenticationSuite.scala +++ b/worker/src/test/scala/org/apache/celeborn/service/deploy/worker/storage/ApiWorkerResourceAuthenticationSuite.scala @@ -19,7 +19,7 @@ package org.apache.celeborn.service.deploy.worker.storage import org.apache.celeborn.common.util.CelebornExitKind import org.apache.celeborn.server.common.HttpService -import org.apache.celeborn.server.common.http.{ApiBaseResourceAuthenticationSuite, ApiBaseResourceSuite} +import org.apache.celeborn.server.common.http.ApiBaseResourceAuthenticationSuite import org.apache.celeborn.service.deploy.worker.{Worker, WorkerArguments} class ApiWorkerResourceAuthenticationSuite extends ApiBaseResourceAuthenticationSuite {