forked from apache/spark
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
SHS-NG M8: Limit disk usage of the history server.
This change adds a new configuration option and support code that limits how much disk space the SHS will use. The default value is pretty generous so that applications will, hopefully, only rarely need to be replayed. This works by keeping track of how much data each application is using; because it's not possible to know, before replaying, how much space will be needed, it's possible that usage will exceed the configured limit temporarily. The code uses the concept of a "lease" to try to limit how much the SHS will exceed the limit. Active UIs are also tracked, so they're never deleted. This works in tandem with the existing option of how many active UIs are loaded; because unused UIs will be unloaded, their disk stores will also become candidates for deletion. If the data is not deleted, though, re-loading the UI is pretty quick. Because UI now may need to be re-created, this change also restores the previous behavior that the UI data will only be generated the first time the UI for an application is built. This speeds up the building of the application list, since less data needs to be read from the logs.
- Loading branch information
Marcelo Vanzin
committed
May 2, 2017
1 parent
07121d5
commit 18e79aa
Showing
4 changed files
with
496 additions
and
75 deletions.
There are no files selected for viewing
290 changes: 290 additions & 0 deletions
290
core/src/main/scala/org/apache/spark/deploy/history/DiskStoreManager.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,290 @@ | ||
/* | ||
* 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.history | ||
|
||
import java.io.File | ||
import java.nio.file.Files | ||
import java.nio.file.attribute.PosixFilePermissions | ||
import java.util.concurrent.atomic.AtomicLong | ||
|
||
import scala.collection.JavaConverters._ | ||
import scala.collection.mutable.{HashMap, ListBuffer} | ||
|
||
import org.apache.commons.io.FileUtils | ||
|
||
import org.apache.spark.SparkConf | ||
import org.apache.spark.internal.Logging | ||
import org.apache.spark.kvstore.KVStore | ||
import org.apache.spark.status.KVUtils._ | ||
import org.apache.spark.util.Clock | ||
|
||
/** | ||
* A class used to keep track of disk usage by the SHS, allowing application data to be "evicted" | ||
* from disk when usage exceeds a configurable threshold. | ||
* | ||
* The goal of the class is not to guarantee that usage will never exceed the threshold; because of | ||
* how application data is written, disk usage may temporarily go higher. But, eventually, it | ||
* should fall back under the threshold. | ||
* | ||
* @param conf Spark configuration. | ||
* @param path Path where to store application data. | ||
* @param listing The listing store, used to persist usage data. | ||
* @param clock Clock instance to use. | ||
*/ | ||
private class DiskStoreManager( | ||
conf: SparkConf, | ||
path: File, | ||
listing: KVStore, | ||
clock: Clock) extends Logging { | ||
|
||
import config._ | ||
|
||
private val appStoreDir = new File(path, "apps") | ||
if (!appStoreDir.isDirectory() && !appStoreDir.mkdir()) { | ||
throw new IllegalArgumentException(s"Failed to create app directory ($appStoreDir).") | ||
} | ||
|
||
private val tmpStoreDir = new File(path, "temp") | ||
if (!tmpStoreDir.isDirectory() && !tmpStoreDir.mkdir()) { | ||
throw new IllegalArgumentException(s"Failed to create temp directory ($tmpStoreDir).") | ||
} | ||
|
||
private val eventLogSizeRatio = conf.get(EVENT_TO_STORE_SIZE_RATIO) | ||
private val maxUsage = conf.get(MAX_LOCAL_DISK_USAGE) | ||
private val currentUsage = new AtomicLong(0L) | ||
private val active = new HashMap[(String, Option[String]), Long]() | ||
|
||
def initialize(): Unit = { | ||
updateUsage(sizeOf(appStoreDir)) | ||
|
||
// Clean up any temporary stores during start up. This assumes that they're leftover from other | ||
// instances and are not useful. | ||
tmpStoreDir.listFiles().foreach(FileUtils.deleteQuietly) | ||
|
||
// Go through the recorded store directories and remove any that may have been removed by | ||
// external code. | ||
val orphans = listing.view(classOf[ApplicationStoreInfo]).asScala.filter { info => | ||
!new File(info.path).exists() | ||
}.toSeq | ||
|
||
orphans.foreach { info => | ||
listing.delete(info.getClass(), info.path) | ||
} | ||
} | ||
|
||
/** | ||
* Lease some space from the store. The leased space is calculated as a fraction of the given | ||
* event log size; this is an approximation, and doesn't mean the application store cannot | ||
* outgrow the lease. | ||
* | ||
* If there's not enough space for the lease, other applications might be evited to make room. | ||
* This method always returns a lease, meaning that it's possible for local disk usage to grow | ||
* past the configured threshold if there aren't enough idle applications to evict. | ||
* | ||
* While the lease is active, the data is written to a temporary location, so `openStore()` | ||
* will still return `None` for the application. | ||
*/ | ||
def lease(eventLogSize: Long): Lease = { | ||
val needed = approximateSize(eventLogSize) | ||
makeRoom(needed) | ||
|
||
val perms = PosixFilePermissions.fromString("rwx------") | ||
val tmp = Files.createTempDirectory(tmpStoreDir.toPath(), "appstore", | ||
PosixFilePermissions.asFileAttribute(perms)).toFile() | ||
|
||
updateUsage(needed) | ||
new Lease(tmp, needed) | ||
} | ||
|
||
/** | ||
* Returns whether there's enough free space to create a store for an application event log. | ||
* This uses an approximation of what's the expected size of an application store given the | ||
* size of the event log, since there's no way to really know that relationship up front. | ||
*/ | ||
def hasFreeSpace(eventLogSize: Long): Boolean = { | ||
approximateSize(eventLogSize) <= free() | ||
} | ||
|
||
/** | ||
* Returns the location of an application store if it's still available. Marks the store as | ||
* being used so that it's not evicted when running out of designated space. | ||
*/ | ||
def openStore(appId: String, attemptId: Option[String]): Option[File] = { | ||
val storePath = active.synchronized { | ||
val path = appStorePath(appId, attemptId) | ||
if (path.isDirectory()) { | ||
active(appId -> attemptId) = sizeOf(path) | ||
Some(path) | ||
} else { | ||
None | ||
} | ||
} | ||
|
||
storePath.foreach { path => | ||
updateAccessTime(appId, attemptId) | ||
} | ||
|
||
storePath | ||
} | ||
|
||
/** | ||
* Tell the disk manager that the store for the given application is not being used anymore. | ||
* | ||
* @param delete Whether to delete the store from disk. | ||
*/ | ||
def release(appId: String, attemptId: Option[String], delete: Boolean = false): Unit = { | ||
// Because LevelDB may modify the structure of the store files even when just reading, update | ||
// the accounting for this application when it's closed. | ||
val oldSizeOpt = active.synchronized { | ||
active.remove(appId -> attemptId) | ||
} | ||
|
||
oldSizeOpt.foreach { oldSize => | ||
val path = appStorePath(appId, attemptId) | ||
updateUsage(-oldSize) | ||
if (path.isDirectory()) { | ||
if (delete) { | ||
FileUtils.deleteDirectory(path) | ||
} else { | ||
updateUsage(sizeOf(path)) | ||
} | ||
} | ||
} | ||
} | ||
|
||
/** | ||
* A non-scientific approximation of how big an app state store will be given the size of the | ||
* event log. By default it's 30% of the event log size. | ||
*/ | ||
private def approximateSize(eventLogSize: Long): Long = { | ||
math.ceil(eventLogSizeRatio * eventLogSize).toLong | ||
} | ||
|
||
/** Current free space. Considers space currently leased out too. */ | ||
private def free(): Long = { | ||
math.max(maxUsage - currentUsage.get(), 0L) | ||
} | ||
|
||
private def makeRoom(size: Long): Unit = { | ||
if (free() < size) { | ||
logDebug(s"Not enough free space, looking at candidates for deletion...") | ||
val evicted = new ListBuffer[ApplicationStoreInfo]() | ||
val iter = listing.view(classOf[ApplicationStoreInfo]).index("lastAccess").closeableIterator() | ||
try { | ||
var needed = size | ||
while (needed > 0 && iter.hasNext()) { | ||
val info = iter.next() | ||
val isActive = active.synchronized { | ||
active.contains(info.appId -> info.attemptId) | ||
} | ||
if (!isActive) { | ||
evicted += info | ||
needed -= info.size | ||
} | ||
} | ||
} finally { | ||
iter.close() | ||
} | ||
|
||
evicted.foreach { info => | ||
logInfo(s"Deleting store for ${info.appId}/${info.attemptId}.") | ||
FileUtils.deleteDirectory(new File(info.path)) | ||
listing.delete(info.getClass(), info.path) | ||
} | ||
logDebug(s"Deleted a total of ${evicted.size} app stores.") | ||
} | ||
} | ||
|
||
private def appStorePath(appId: String, attemptId: Option[String]): File = { | ||
val fileName = appId + attemptId.map("_" + _).getOrElse("") + ".ldb" | ||
new File(appStoreDir, fileName) | ||
} | ||
|
||
private def updateAccessTime(appId: String, attemptId: Option[String]): Unit = { | ||
val path = appStorePath(appId, attemptId) | ||
val info = ApplicationStoreInfo(path.getAbsolutePath(), clock.getTimeMillis(), appId, attemptId, | ||
sizeOf(path)) | ||
listing.write(info) | ||
} | ||
|
||
private def updateUsage(delta: Long): Unit = { | ||
val updated = currentUsage.addAndGet(delta) | ||
if (updated < 0) { | ||
throw new IllegalStateException( | ||
s"Disk usage tracker went negative (now = $updated, delta = $delta)") | ||
} | ||
} | ||
|
||
/** Visible for testing. Return the size of a directory. */ | ||
private[history] def sizeOf(path: File): Long = FileUtils.sizeOf(path) | ||
|
||
class Lease( | ||
val path: File, | ||
private val leased: Long) { | ||
|
||
/** | ||
* Commits a lease to its final location, and update accounting information. Optionally | ||
* marks the application as active, so that it's not eligible for eviction if data needs | ||
* to be cleaned up. | ||
*/ | ||
def commit(appId: String, attemptId: Option[String], activate: Boolean = false): File = { | ||
val dst = appStorePath(appId, attemptId) | ||
|
||
active.synchronized { | ||
require(!active.contains(appId -> attemptId), | ||
s"Cannot commit lease for active application $appId / $attemptId") | ||
|
||
if (dst.isDirectory()) { | ||
val size = sizeOf(dst) | ||
FileUtils.deleteDirectory(dst) | ||
updateUsage(-size) | ||
} | ||
} | ||
|
||
updateUsage(-leased) | ||
|
||
val newSize = sizeOf(path) | ||
makeRoom(newSize) | ||
path.renameTo(dst) | ||
updateUsage(newSize) | ||
updateAccessTime(appId, attemptId) | ||
|
||
if (activate) { | ||
active.synchronized { | ||
active(appId -> attemptId) = newSize | ||
} | ||
} | ||
dst | ||
} | ||
|
||
/** Deletes the temporary directory created for the lease. */ | ||
def rollback(): Unit = { | ||
updateUsage(-leased) | ||
FileUtils.deleteDirectory(path) | ||
} | ||
|
||
} | ||
|
||
} | ||
|
||
private case class ApplicationStoreInfo( | ||
@KVIndexParam path: String, | ||
@KVIndexParam("lastAccess") lastAccess: Long, | ||
appId: String, | ||
attemptId: Option[String], | ||
size: Long) |
Oops, something went wrong.