Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(133)

Unified Diff: net/disk_cache/simple/simple_util_win.cc

Issue 651063002: Deflake Simple Cache backend on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: C4800 Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/disk_cache/simple/simple_util_win.cc
diff --git a/net/disk_cache/simple/simple_util_win.cc b/net/disk_cache/simple/simple_util_win.cc
new file mode 100644
index 0000000000000000000000000000000000000000..d0d191dbacdd935defd5ac478cc97d6703f23d5a
--- /dev/null
+++ b/net/disk_cache/simple/simple_util_win.cc
@@ -0,0 +1,44 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "net/disk_cache/simple/simple_util.h"
+
+#include <windows.h>
+
+#include "base/files/file_util.h"
+#include "base/format_macros.h"
+#include "base/rand_util.h"
+#include "base/strings/stringprintf.h"
+#include "net/disk_cache/cache_util.h"
+
+namespace disk_cache {
+namespace simple_util {
+
+bool SimpleCacheDeleteFile(const base::FilePath& path) {
pasko 2014/10/29 13:01:02 seems like it better fits to net/disk_cache/cache_
gavinp 2014/11/20 15:43:03 Acknowledged.
+ // Even if a file was opened with FLAG_SHARE_DELETE, it is not possible to
+ // create a new file with the same name until the original file is actually
pasko 2014/10/29 13:01:02 disclaimer: I don't know windows file APIs, can yo
gavinp 2014/11/20 15:43:03 If a file is open and it is deleted, then all open
pasko 2014/11/20 16:19:32 Got it.
+ // deleted. To allow new files to be created with the new name right away,
+ // the file is renamed before it is deleted.
+
+ // Why a random name? Because if the name was derived from our original name,
+ // then churn on a particular cache entry could cause flakey behaviour.
+
+ // TODO(gaivnp): Ensure these "todelete_" files are cleaned up on periodic
+ // directory sweeps.
+ const base::FilePath rename_target =
+ path.DirName().AppendASCII(base::StringPrintf("todelete_%016" PRIx64,
+ base::RandUint64()));
+
+ bool rename_succeeded = !!MoveFile(path.value().c_str(),
+ rename_target.value().c_str());
+ if (rename_succeeded)
+ return DeleteCacheFile(rename_target);
+
+ // The rename did not succeed. The fallback behaviour is to delete the file in
+ // place, which might cause some flake.
+ return DeleteCacheFile(path);
+}
+
+} // namespace simple_util
+} // namespace disk_cache

Powered by Google App Engine
This is Rietveld 408576698