-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[SC-86940][DELTA]Fix potential checkpoint corruption issue for GCS in…
… OSS Delta This PR moves checkpoint write to a separate thread for GCS to workaround the potential checkpoint corruption issue when a thread is interrupted. GitOrigin-RevId: 418df2441923c85c6415f9baec157c923c4c3dca
- Loading branch information
1 parent
315a4a0
commit 95e9076
Showing
3 changed files
with
169 additions
and
63 deletions.
There are no files selected for viewing
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
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
109 changes: 109 additions & 0 deletions
109
core/src/test/scala/org/apache/spark/sql/delta/CheckpointsSuite.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,109 @@ | ||
| /* | ||
| * Copyright (2021) The Delta Lake Project Authors. | ||
| * | ||
| * Licensed 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.sql.delta | ||
|
|
||
| import java.net.URI | ||
|
|
||
| import org.apache.spark.sql.delta.storage.LocalLogStore | ||
| import org.apache.hadoop.conf.Configuration | ||
| import org.apache.hadoop.fs.{FSDataOutputStream, Path, RawLocalFileSystem} | ||
| import org.apache.hadoop.fs.permission.FsPermission | ||
| import org.apache.hadoop.util.Progressable | ||
|
|
||
| import org.apache.spark.sql.QueryTest | ||
| import org.apache.spark.sql.test.SharedSparkSession | ||
|
|
||
| class CheckpointsSuite extends QueryTest with SharedSparkSession { | ||
|
|
||
| protected override def sparkConf = { | ||
| // Set the gs LogStore impl to `LocalLogStore` so that it will work with `FakeGCSFileSystem`. | ||
| // The default one is `HDFSLogStore` which requires a `FileContext` but we don't have one. | ||
| super.sparkConf.set("spark.delta.logStore.gs.impl", classOf[LocalLogStore].getName) | ||
| } | ||
|
|
||
| test("SC-86940: isGCSPath") { | ||
| val conf = new Configuration() | ||
| assert(Checkpoints.isGCSPath(conf, new Path("gs://foo/bar"))) | ||
| // Scheme is case insensitive | ||
| assert(Checkpoints.isGCSPath(conf, new Path("Gs://foo/bar"))) | ||
| assert(Checkpoints.isGCSPath(conf, new Path("GS://foo/bar"))) | ||
| assert(Checkpoints.isGCSPath(conf, new Path("gS://foo/bar"))) | ||
| assert(!Checkpoints.isGCSPath(conf, new Path("non-gs://foo/bar"))) | ||
| assert(!Checkpoints.isGCSPath(conf, new Path("/foo"))) | ||
| // Set the default file system and verify we can detect it | ||
| conf.set("fs.defaultFS", "gs://foo/") | ||
| conf.set("fs.gs.impl", classOf[FakeGCSFileSystem].getName) | ||
| conf.set("fs.gs.impl.disable.cache", "true") | ||
| assert(Checkpoints.isGCSPath(conf, new Path("/foo"))) | ||
| } | ||
|
|
||
| test("SC-86940: writing a GCS checkpoint should happen in a new thread") { | ||
| withTempDir { tempDir => | ||
| val path = tempDir.getCanonicalPath | ||
| spark.range(1).write.format("delta").save(path) | ||
|
|
||
| // Use `FakeGCSFileSystem` which will verify we write in a separate gcs thread. | ||
| withSQLConf( | ||
| "fs.gs.impl" -> classOf[FakeGCSFileSystem].getName, | ||
| "fs.gs.impl.disable.cache" -> "true") { | ||
| DeltaLog.clearCache() | ||
| val gsPath = new Path(s"gs://${tempDir.getCanonicalPath}") | ||
| val deltaLog = DeltaLog.forTable(spark, gsPath) | ||
| deltaLog.checkpoint() | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * A fake GCS file system to verify delta commits are written in a separate gcs thread. | ||
| */ | ||
| class FakeGCSFileSystem extends RawLocalFileSystem { | ||
| override def getScheme: String = "gs" | ||
| override def getUri: URI = URI.create("gs:/") | ||
|
|
||
| private def assertGCSThread(f: Path): Unit = { | ||
| if (f.getName.contains(".json") || f.getName.contains(".checkpoint")) { | ||
| assert( | ||
| Thread.currentThread().getName.contains("delta-gcs-"), | ||
| s"writing $f was happening in non gcs thread: ${Thread.currentThread()}") | ||
| } | ||
| } | ||
|
|
||
| override def create( | ||
| f: Path, | ||
| permission: FsPermission, | ||
| overwrite: Boolean, | ||
| bufferSize: Int, | ||
| replication: Short, | ||
| blockSize: Long, | ||
| progress: Progressable): FSDataOutputStream = { | ||
| assertGCSThread(f) | ||
| super.create(f, permission, overwrite, bufferSize, replication, blockSize, progress) | ||
| } | ||
|
|
||
| override def create( | ||
| f: Path, | ||
| overwrite: Boolean, | ||
| bufferSize: Int, | ||
| replication: Short, | ||
| blockSize: Long, | ||
| progress: Progressable): FSDataOutputStream = { | ||
| assertGCSThread(f) | ||
| super.create(f, overwrite, bufferSize, replication, blockSize, progress) | ||
| } | ||
| } |