Changeset 26015 for trunk/ippTools

Timestamp:

Nov 3, 2009, 1:02:08 PM (17 years ago)

Author:

bills

Message:

Spread building of distribution bundles over a number of hosts (currently 5)

Location:

trunk/ippTools

Files:

• share/disttool_pendingfileset.sql (modified) (1 diff)
• share/disttool_processedcomponent.sql (modified) (1 diff)
• share/pxadmin_create_tables.sql (modified) (2 diffs)
• src/disttool.c (modified) (4 diffs)
• src/disttoolConfig.c (modified) (2 diffs)

trunk/ippTools/share/disttool_pendingfileset.sql

@@ -3 +3 @@
     target_id,
     distRun.stage,
+    distRun.outdir as dist_dir,
     stage_id,
     distTarget.dist_group,
     distTarget.filter,
-    CONCAT_WS('.', distRun.outroot, CONVERT(distRun.dist_id, CHAR)) as dist_dir,
+--    CONCAT_WS('.', distRun.outroot, CONVERT(distRun.dist_id, CHAR)) as dist_dir,
     rcDestination.name AS product_name,
     rcDestination.dest_id,

trunk/ippTools/share/disttool_processedcomponent.sql

@@ -5 +5 @@
     stage_id,
     component,
-    CONCAT_WS('.', outroot, CONVERT(dist_id, CHAR)) as outdir,
+    distComponent.outdir,
     bytes,
     md5sum,

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -1344 +1344 @@
     label       VARCHAR(64),
     outroot     VARCHAR(255),
+    outdir      VARCHAR(255),
     clean       TINYINT,
     no_magic    TINYINT,
@@ -1362 +1363 @@
     md5sum      VARCHAR(32),
     state       VARCHAR(64),
+    outdir      VARCHAR(255),
     name        VARCHAR(255),
     fault       SMALLINT,

trunk/ippTools/src/disttool.c

@@ -371 +371 @@
                 new_label,
                 outroot,
+                NULL,     // outdir
                 clean,
                 no_magic,
                 "new",
-                NULL,   // time_stamp
+                NULL,    // time_stamp
                 0,       // fault
-                set_note    // note does not propagate
+                set_note // note does not propagate
                 );
 
@@ -430 +431 @@
     PXOPT_LOOKUP_STR(state, config->args, "-set_state", false, false);
     PXOPT_LOOKUP_STR(label, config->args, "-set_label", false, false);
+    PXOPT_LOOKUP_STR(outdir, config->args, "-set_outdir", false, false);
     PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false);
 
@@ -440 +442 @@
     psString query = psStringCopy("UPDATE distRun SET time_stamp = UTC_TIMESTAMP()");
 
+    if (outdir) {
+        psStringAppend(&query, " , outdir = '%s'", outdir);
+    }
     if (state) {
         psStringAppend(&query, " , state = '%s'", state);
@@ -652 +657 @@
     PXOPT_LOOKUP_S32(bytes, config->args, "-bytes", require_fileinfo, false);
     PXOPT_LOOKUP_STR(md5sum, config->args, "-md5sum", require_fileinfo, false);
+    PXOPT_LOOKUP_STR(outdir, config->args, "-outdir", require_fileinfo, false);
     PXOPT_LOOKUP_STR(name, config->args, "-name", require_fileinfo, false);
 
-    if (!distComponentInsert(config->dbh, dist_id, component, bytes, md5sum, "full", name, fault)) {
+    if (!distComponentInsert(config->dbh, dist_id, component, bytes, md5sum, "full", outdir, name, fault)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         return false;

trunk/ippTools/src/disttoolConfig.c

@@ -70 +70 @@
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_state", 0, "new value for state", NULL);
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_label", 0, "new value for label", NULL);
+    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_outdir", 0, "new value for outdir", NULL);
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-stage",     0, "value for stage", NULL);
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state",     0, "value for state", NULL);
@@ -98 +99 @@
     psMetadataAddS64(addprocessedcomponentArgs, PS_LIST_TAIL, "-dist_id", 0, "define dist_id", 0);
     psMetadataAddStr(addprocessedcomponentArgs, PS_LIST_TAIL, "-component", 0, "define component (required)", NULL);
+    psMetadataAddStr(addprocessedcomponentArgs, PS_LIST_TAIL, "-outdir", 0, "define output directory", NULL);
     psMetadataAddStr(addprocessedcomponentArgs, PS_LIST_TAIL, "-name", 0, "define file name", NULL);
     psMetadataAddS32(addprocessedcomponentArgs, PS_LIST_TAIL, "-bytes", 0, "define file size", 0);