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

[PATCH v13 24/41] receive-pack.c: use a reference transaction for updating the refs

From
Ronnie Sahlberg <sahlberg@google.com>
Date
Jun 3, 2014, 21:37 UTC
Message-ID
<1401831479-3388-25-git-send-email-sahlberg@google.com>
In-Reply-To
<1401831479-3388-1-git-send-email-sahlberg@google.com>
Wrap all the ref updates inside a transaction.
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
---
 builtin/receive-pack.c | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index c323081..13f4a63 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -46,6 +46,7 @@ static void *head_name_to_free;
 static int sent_capabilities;
 static int shallow_update;
 static const char *alt_shallow_file;
+static struct string_list error_strings = STRING_LIST_INIT_DUP;
 
 static enum deny_action parse_deny_action(const char *var, const char *value)
 {
@@ -475,7 +476,6 @@ static const char *update(struct command *cmd, struct shallow_info *si)
 	const char *namespaced_name;
 	unsigned char *old_sha1 = cmd->old_sha1;
 	unsigned char *new_sha1 = cmd->new_sha1;
-	struct ref_lock *lock;
 
 	/* only refs/... are allowed */
 	if (!starts_with(name, "refs/") || check_refname_format(name + 5, 0)) {
@@ -576,19 +576,31 @@ static const char *update(struct command *cmd, struct shallow_info *si)
 		return NULL; /* good */
 	}
 	else {
+		struct strbuf err = STRBUF_INIT;
+		struct ref_transaction *transaction;
+
 		if (shallow_update && si->shallow_ref[cmd->index] &&
 		    update_shallow_ref(cmd, si))
 			return "shallow error";
 
-		lock = lock_any_ref_for_update(namespaced_name, old_sha1,
-					       0, NULL);
-		if (!lock) {
-			rp_error("failed to lock %s", name);
-			return "failed to lock";
-		}
-		if (write_ref_sha1(lock, new_sha1, "push")) {
-			return "failed to write"; /* error() already called */
+		transaction = ref_transaction_begin(&err);
+		if (!transaction ||
+		    ref_transaction_update(transaction, namespaced_name,
+					   new_sha1, old_sha1, 0, 1, &err) ||
+		    ref_transaction_commit(transaction, "push", &err)) {
+
+			const char *str;
+			string_list_append(&error_strings, err.buf);
+			str = error_strings.items[error_strings.nr - 1].string;
+			strbuf_release(&err);
+
+			ref_transaction_free(transaction);
+			rp_error("%s", str);
+			return str;
 		}
+
+		ref_transaction_free(transaction);
+		strbuf_release(&err);
 		return NULL; /* good */
 	}
 }
@@ -1215,5 +1227,6 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix)
 		packet_flush(1);
 	sha1_array_clear(&shallow);
 	sha1_array_clear(&ref);
+	string_list_clear(&error_strings, 0);
 	return 0;
 }

-- 
2.0.0.567.g64a7adf
Previous: Ronnie SahlbergNext: Ronnie Sahlberg
Message 25 of 43 in “Use ref transactions”
  1. 00/41 Use ref transactionsRonnie Sahlberg, Jun 3, 2014
  2. 01/41 refs.c: remove ref_transaction_rollbackRonnie Sahlberg, Jun 3, 2014
  3. 02/41 refs.c: ref_transaction_commit should not free the transactionRonnie Sahlberg, Jun 3, 2014
  4. 03/41 refs.c: constify the sha arguments for ref_transaction_create|delete|updateRonnie Sahlberg, Jun 3, 2014
  5. 04/41 refs.c: allow passing NULL to ref_transaction_freeRonnie Sahlberg, Jun 3, 2014
  6. 05/41 refs.c: add a strbuf argument to ref_transaction_commit for error loggingRonnie Sahlberg, Jun 3, 2014
  7. 06/41 refs.c: add an err argument to repack_without_refsRonnie Sahlberg, Jun 3, 2014
  8. 07/41 refs.c: make ref_update_reject_duplicates take a strbuf argument for errorsRonnie Sahlberg, Jun 3, 2014
  9. 08/41 refs.c: add an err argument to delete_ref_looseRonnie Sahlberg, Jun 3, 2014
  10. 09/41 refs.c: make update_ref_write update a strbuf on failureRonnie Sahlberg, Jun 3, 2014
  11. 10/41 update-ref: use err argument to get error from ref_transaction_commitRonnie Sahlberg, Jun 3, 2014
  12. 11/41 refs.c: remove the onerr argument to ref_transaction_commitRonnie Sahlberg, Jun 3, 2014
  13. 12/41 refs.c: change ref_transaction_update() to do error checking and return statusRonnie Sahlberg, Jun 3, 2014
  14. 13/41 refs.c: change ref_transaction_create to do error checking and return statusRonnie Sahlberg, Jun 3, 2014
  15. 14/41 refs.c: update ref_transaction_delete to check for error and return statusRonnie Sahlberg, Jun 3, 2014
  16. 15/41 refs.c: make ref_transaction_begin take an err argumentRonnie Sahlberg, Jun 3, 2014
  17. 16/41 refs.c: add transaction.status and track OPEN/CLOSED/ERRORRonnie Sahlberg, Jun 3, 2014
  18. 17/41 tag.c: use ref transactions when doing updatesRonnie Sahlberg, Jun 3, 2014
  19. 18/41 replace.c: use the ref transaction functions for updatesRonnie Sahlberg, Jun 3, 2014
  20. 19/41 commit.c: use ref transactions for updatesRonnie Sahlberg, Jun 3, 2014
  21. 20/41 sequencer.c: use ref transactions for all ref updatesRonnie Sahlberg, Jun 3, 2014
  22. 21/41 fast-import.c: change update_branch to use ref transactionsRonnie Sahlberg, Jun 3, 2014
  23. 22/41 branch.c: use ref transaction for all ref updatesRonnie Sahlberg, Jun 3, 2014
  24. 23/41 refs.c: change update_ref to use a transactionRonnie Sahlberg, Jun 3, 2014
  25. 24/41 receive-pack.c: use a reference transaction for updating the refsRonnie Sahlberg, Jun 3, 2014
  26. 25/41 fast-import.c: use a ref transaction when dumping tagsRonnie Sahlberg, Jun 3, 2014
  27. 26/41 walker.c: use ref transaction for ref updatesRonnie Sahlberg, Jun 3, 2014
  28. 27/41 refs.c: make lock_ref_sha1 staticRonnie Sahlberg, Jun 3, 2014
  29. 28/41 refs.c: remove the update_ref_lock functionRonnie Sahlberg, Jun 3, 2014
  30. 29/41 refs.c: remove the update_ref_write functionRonnie Sahlberg, Jun 3, 2014
  31. 30/41 refs.c: remove lock_ref_sha1Ronnie Sahlberg, Jun 3, 2014
  32. 31/41 refs.c: make prune_ref use a transaction to delete the refRonnie Sahlberg, Jun 3, 2014
  33. 32/41 refs.c: make delete_ref use a transactionRonnie Sahlberg, Jun 3, 2014
  34. 33/41 refs.c: pass the ref log message to _create/delete/update instead of _commitRonnie Sahlberg, Jun 3, 2014
  35. 34/41 refs.c: pass NULL as *flags to read_ref_fullRonnie Sahlberg, Jun 3, 2014
  36. 35/41 refs.c: pack all refs before we start to rename a refRonnie Sahlberg, Jun 3, 2014
  37. 36/41 refs.c: move the check for valid refname to lock_ref_sha1_basicRonnie Sahlberg, Jun 3, 2014
  38. 37/41 refs.c: call lock_ref_sha1_basic directly from commitRonnie Sahlberg, Jun 3, 2014
  39. 38/41 refs.c: pass a skip list to name_conflict_fnRonnie Sahlberg, Jun 3, 2014
  40. 39/41 refs.c: propagate any errno==ENOTDIR from _commit back to the callersRonnie Sahlberg, Jun 3, 2014
  41. 40/41 fetch.c: change s_update_ref to use a ref transactionRonnie Sahlberg, Jun 3, 2014
  42. 41/41 refs.c: make write_ref_sha1 staticRonnie Sahlberg, Jun 3, 2014
  43. Jonathan NiederJun 3, 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.