From: Michael Adam <obnox@samba.org>
Date: Tue, 24 Feb 2009 09:54:13 +0000 (+0100)
Subject: s3:net: wrap net conf import into one big transaction
X-Git-Tag: build_3.3.2_ctdb_1~53
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=f70716edac143b8d83fdfaa409c3c68373ed801f;p=obnox%2Fsamba-ctdb.git

s3:net: wrap net conf import into one big transaction

This speeds up "net conf import" of a file with 2000 shares
from 11 minutest to 1m50s on my box.

Michael

Signed-off-by: Michael Adam <obnox@samba.org>
---

diff --git a/source/utils/net_conf.c b/source/utils/net_conf.c
index 3d542fc1bc..5847dc7197 100644
--- a/source/utils/net_conf.c
+++ b/source/utils/net_conf.c
@@ -331,6 +331,12 @@ static int net_conf_import(struct net_context *c, struct smbconf_ctx *conf_ctx,
 			 "would import the following configuration:\n\n");
 	}
 
+	werr = smbconf_transaction_start(conf_ctx);
+	if (!W_ERROR_IS_OK(werr)) {
+		d_printf("error starting transaction: %s\n", win_errstr(werr));
+		goto done;
+	}
+
 	if (servicename != NULL) {
 		struct smbconf_service *service = NULL;
 
@@ -338,11 +344,11 @@ static int net_conf_import(struct net_context *c, struct smbconf_ctx *conf_ctx,
 					 servicename,
 					 &service);
 		if (!W_ERROR_IS_OK(werr)) {
-			goto done;
+			goto cancel;
 		}
 		werr = import_process_service(c, conf_ctx, service);
 		if (!W_ERROR_IS_OK(werr)) {
-			goto done;
+			goto cancel;
 		}
 	} else {
 		struct smbconf_service **services = NULL;
@@ -352,24 +358,39 @@ static int net_conf_import(struct net_context *c, struct smbconf_ctx *conf_ctx,
 					  &num_shares,
 					  &services);
 		if (!W_ERROR_IS_OK(werr)) {
-			goto done;
+			goto cancel;
 		}
 		if (!c->opt_testmode) {
 			werr = smbconf_drop(conf_ctx);
 			if (!W_ERROR_IS_OK(werr)) {
-				goto done;
+				goto cancel;
 			}
 		}
 		for (sidx = 0; sidx < num_shares; sidx++) {
 			werr = import_process_service(c, conf_ctx,
 						      services[sidx]);
 			if (!W_ERROR_IS_OK(werr)) {
-				goto done;
+				goto cancel;
 			}
 		}
 	}
 
-	ret = 0;
+	werr = smbconf_transaction_commit(conf_ctx);
+	if (!W_ERROR_IS_OK(werr)) {
+		d_printf("error committing transaction: %s\n",
+			 win_errstr(werr));
+	} else {
+		ret = 0;
+	}
+
+	goto done;
+
+cancel:
+	werr = smbconf_transaction_cancel(conf_ctx);
+	if (!W_ERROR_IS_OK(werr)) {
+		d_printf("error cancelling transaction: %s\n",
+			 win_errstr(werr));
+	}
 
 done:
 	TALLOC_FREE(mem_ctx);