Changeset 223 for branches/samba-3.3.x/source/utils/net_conf.c

Timestamp:

May 24, 2009, 7:51:24 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.3

File:

• branches/samba-3.3.x/source/utils/net_conf.c (modified) (2 diffs)

branches/samba-3.3.x/source/utils/net_conf.c

@@ -339 +339 @@
                                          &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 {
@@ -353 +353 @@
                                           &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;
+                        }
+                }
+
+                /*
+                 * Wrap the importing of shares into a transaction,
+                 * but only 100 at a time, in order to serve memory.
+                 * The allocated memory accumulates across the actions
+                 * within the transaction, and for me, some 1500
+                 * imported shares, the MAX_TALLOC_SIZE of 256 MB
+                 * was exceeded.
+                 */
+                werr = smbconf_transaction_start(conf_ctx);
+                if (!W_ERROR_IS_OK(werr)) {
+                        d_printf("error starting transaction: %s\n",
+                                 win_errstr(werr));
+                        goto done;
+                }
+
                 for (sidx = 0; sidx < num_shares; sidx++) {
                         werr = import_process_service(c, conf_ctx,
                                                       services[sidx]);
                         if (!W_ERROR_IS_OK(werr)) {
+                                goto cancel;
+                        }
+
+                        if (sidx % 100) {
+                                continue;
+                        }
+
+                        werr = smbconf_transaction_commit(conf_ctx);
+                        if (!W_ERROR_IS_OK(werr)) {
+                                d_printf("error committing transaction: %s\n",
+                                         win_errstr(werr));
                                 goto done;
                         }
-                }
-        }
-
-        ret = 0;
+                        werr = smbconf_transaction_start(conf_ctx);
+                        if (!W_ERROR_IS_OK(werr)) {
+                                d_printf("error starting transaction: %s\n",
+                                         win_errstr(werr));
+                                goto done;
+                        }
+                }
+        }
+
+        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: