git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v3 16/17] rename_tmp_log(): limit the number of remote_empty_directories() attempts

From
Michael Haggerty <mhagger@alum.mit.edu>
Date
Jan 18, 2014, 22:49 UTC
Message-ID
<1390085341-2553-17-git-send-email-mhagger@alum.mit.edu>
In-Reply-To
<1390085341-2553-1-git-send-email-mhagger@alum.mit.edu>

This doesn't seem to be a likely error, but we've got the counter anyway, so we might as well use it for an added bit of safety.

Please note that the first call to rename() is optimistic, and it is normal for it to fail if there is a directory in the way. So bump the total number of allowed attempts to 4, to be sure that we can still have at least 3 retries in the case of a race.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
 refs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/refs.c b/refs.c
index a90904b..134d5aa 100644
--- a/refs.c
+++ b/refs.c
@@ -2530,7 +2530,7 @@ int delete_ref(const char *refname, const unsigned char *sha1, int delopt)
 
 static int rename_tmp_log(const char *newrefname)
 {
-	int attempts_remaining = 3;
+	int attempts_remaining = 4;
 
  retry:
 	if (safe_create_leading_directories(git_path("logs/%s", newrefname))) {
@@ -2539,7 +2539,7 @@ static int rename_tmp_log(const char *newrefname)
 	}
 
 	if (rename(git_path(TMP_RENAMED_LOG), git_path("logs/%s", newrefname))) {
-		if (errno==EISDIR || errno==ENOTDIR) {
+		if ((errno==EISDIR || errno==ENOTDIR) && --attempts_remaining > 0) {
 			/*
 			 * rename(a, b) when b is an existing
 			 * directory ought to result in ISDIR, but

-- 
1.8.5.2
Previous: Michael HaggertyNext: Michael Haggerty
Message 17 of 18 in “Fix some mkdir/rmdir races”
  1. 00/17 Fix some mkdir/rmdir racesMichael Haggerty, Jan 18, 2014
  2. 01/17 safe_create_leading_directories(): fix format of "if" chainingMichael Haggerty, Jan 18, 2014
  3. 02/17 safe_create_leading_directories(): reduce scope of local variableMichael Haggerty, Jan 18, 2014
  4. 03/17 safe_create_leading_directories(): add explicit "slash" pointerMichael Haggerty, Jan 18, 2014
  5. 04/17 safe_create_leading_directories(): rename local variableMichael Haggerty, Jan 18, 2014
  6. 05/17 safe_create_leading_directories(): split on first of multiple slashesMichael Haggerty, Jan 18, 2014
  7. 06/17 safe_create_leading_directories(): always restore slash at end of loopMichael Haggerty, Jan 18, 2014
  8. 07/17 safe_create_leading_directories(): introduce enum for return valuesMichael Haggerty, Jan 18, 2014
  9. 08/17 cmd_init_db(): when creating directories, handle errors conservativelyMichael Haggerty, Jan 18, 2014
  10. 09/17 safe_create_leading_directories(): add new error value SCLD_VANISHEDMichael Haggerty, Jan 18, 2014
  11. 10/17 lock_ref_sha1_basic(): on SCLD_VANISHED, retryMichael Haggerty, Jan 18, 2014
  12. 11/17 lock_ref_sha1_basic(): if locking fails with ENOENT, retryMichael Haggerty, Jan 18, 2014
  13. 12/17 remove_dir_recurse(): tighten condition for removing unreadable dirMichael Haggerty, Jan 18, 2014
  14. 13/17 remove_dir_recurse(): handle disappearing files and directoriesMichael Haggerty, Jan 18, 2014
  15. 14/17 rename_ref(): extract function rename_tmp_log()Michael Haggerty, Jan 18, 2014
  16. 15/17 rename_tmp_log(): handle a possible mkdir/rmdir raceMichael Haggerty, Jan 18, 2014
  17. 16/17 rename_tmp_log(): limit the number of remote_empty_directories() attemptsMichael Haggerty, Jan 18, 2014
  18. 17/17 rename_tmp_log(): on SCLD_VANISHED, retryMichael Haggerty, Jan 18, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.