weixiuli commented on a change in pull request #23393: [SPARK-26288][CORE]add initRegisteredExecutorsDB URL: https://github.com/apache/spark/pull/23393#discussion_r262359494
########## File path: core/src/test/scala/org/apache/spark/deploy/ExternalShuffleServiceDbSuite.scala ########## @@ -0,0 +1,193 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.deploy + +import java.io._ +import java.nio.charset.StandardCharsets + +import com.google.common.io.{CharStreams, Closeables, Files} +import org.scalatest.BeforeAndAfterAll + +import org.apache.spark.{SecurityManager, ShuffleSuite, SparkConf, SparkException} +import org.apache.spark.network.shuffle.{ExternalShuffleBlockHandler, ExternalShuffleBlockResolver} +import org.apache.spark.network.shuffle.protocol.ExecutorShuffleInfo +import org.apache.spark.network.util.JavaUtils +import org.apache.spark.util.Utils + + +/** + * This suite gets BlockData when the ExternalShuffleService is restarted + * with #spark.shuffle.service.db.enabled = true or false + * Note that failures in this suite may arise when#spark.shuffle.service.db.enabled = false + */ +class ExternalShuffleServiceDbSuite extends ShuffleSuite with BeforeAndAfterAll { + val sortBlock0 = "Hello!" + val sortBlock1 = "World!" + val SORT_MANAGER = "org.apache.spark.shuffle.sort.SortShuffleManager" + + var sparkConf: SparkConf = _ + var dataContext: TestShuffleDataContext = _ + + var securityManager: SecurityManager = _ + var externalShuffleService: ExternalShuffleService = _ + var bockHandler: ExternalShuffleBlockHandler = _ + var blockResolver: ExternalShuffleBlockResolver = _ + + override def beforeAll() { + super.beforeAll() + sparkConf = new SparkConf() + sparkConf.set("spark.shuffle.service.enabled", "true") + sparkConf.set("spark.local.dir", System.getProperty("java.io.tmpdir")) + Utils.loadDefaultSparkProperties(sparkConf, null) + securityManager = new SecurityManager(sparkConf) + + dataContext = new TestShuffleDataContext(2, 5) + dataContext.create() + // Write some sort data. + dataContext.insertSortShuffleData(0, 0, + Array[Array[Byte]](sortBlock0.getBytes(StandardCharsets.UTF_8), + sortBlock1.getBytes(StandardCharsets.UTF_8))) + registerExecutor() + } + + override def afterAll() { + try { + dataContext.cleanup() + } finally { + super.afterAll() + } + } + + def registerExecutor(): Unit = { + sparkConf.set("spark.shuffle.service.db.enabled", "true") + externalShuffleService = new ExternalShuffleService(sparkConf, securityManager) + + // external Shuffle Service start + externalShuffleService.start() + bockHandler = externalShuffleService.getBlockHandler + blockResolver = bockHandler.getBlockResolver + blockResolver.registerExecutor("app0", "exec0", dataContext.createExecutorInfo(SORT_MANAGER)) + blockResolver.closeForTest() Review comment: closeForTest() needs to be added ,it closes LevelDB timely to make sure LevelDB can be used again next time ,if we don't add it, there will be thrown an exception when we use LevelDB again ( eg: re-create the externalShuffleService). ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services --------------------------------------------------------------------- To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For additional commands, e-mail: reviews-h...@spark.apache.org
