Merge remote-tracking branch 'upstream/candidate-3.8.x' into candidate-3.8.x

docs/HDFS_Stream/CMakeLists.txt

@@ -1,20 +0,0 @@
-################################################################################
-#    Copyright (C) 2011 HPCC Systems.
-#
-#    All rights reserved. This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-
-DOCBOOK_TO_PDF( ${FO_XSL} HDFS_to_HPCC_ConnectorIncluder.xml "HDFS_to_HPCC_Connector")
-

docs/Installing_and_RunningTheHPCCPlatform/Installing_and_RunningTheHPCCPlatform.xml

@@ -669,54 +669,6 @@
         <para></para>
       </sect2>
 
-      <sect2 id="installing-the-Optional-Package">
-        <title>Installing the Optional Packages</title>
-
-        <para>There are three optional packages you can install which will
-        enable resources to be available from your ESP server's ECL Watch
-        page. These resources include:</para>
-
-        <para><itemizedlist spacing="compact">
-            <listitem>
-              <para>Documentation</para>
-            </listitem>
-
-            <listitem>
-              <para>ECL IDE</para>
-            </listitem>
-
-            <listitem>
-              <para>Graph Control</para>
-            </listitem>
-          </itemizedlist></para>
-
-        <para>We recommend installing these packages on your ESP Server
-        node.</para>
-
-        <para>You can find these packages at <ulink
-        url="http://hpccsystems.lexisnexis.com/download/free-community-edition">http://hpccsystems.lexisnexis.com/download/free-community-edition</ulink></para>
-
-        <para><?hard-pagebreak ?>To install the package, follow the
-        appropriate installation instructions:</para>
-
-        <para><emphasis role="bold">Centos/Red Hat/SuSe</emphasis></para>
-
-        <para>Install RPM with the -Uvh switch.</para>
-
-        <para>This is the upgrade command and will perform an automatic
-        upgrade if a previous version is installed or it will just install
-        fresh if no other version has been installed.</para>
-
-        <programlisting>sudo rpm -Uvh &lt;rpm file name&gt;</programlisting>
-
-        <para><emphasis role="bold">Ubuntu/Debian </emphasis></para>
-
-        <para>For Ubuntu installations a Debian package is provided. To
-        install the package, use:</para>
-
-        <programlisting>sudo dpkg -i &lt;deb filename&gt;</programlisting>
-      </sect2>
-
       <sect2 id="initial-startup">
         <title><emphasis>Initial Startup</emphasis></title>
 
@@ -812,6 +764,8 @@
               </listitem>
 
               <listitem>
+                <?dbfo keep-together="always"?>
+
                 <para>From ECL Watch page, click on the <emphasis
                 role="bold">Resources </emphasis> link in the menu on the left
                 side.</para>
@@ -821,35 +775,28 @@
 
                     <mediaobject>
                       <imageobject>
-                        <imagedata fileref="images/vmimg07aa3.JPG" />
+                        <imagedata fileref="images/GS_1311.JPG" />
                       </imageobject>
                     </mediaobject>
                   </figure></para>
 
-                <para><emphasis role="bold">Note: The order of items on the
-                page may vary depending on the order in which optional
-                packages are installed.</emphasis></para>
-
-                <para>If this page is not visible, either follow the link to
-                the HPCC System's portal or install the Optional
-                Packages,</para>
+                <para>Follow the link to the HPCC System's portal.</para>
               </listitem>
 
               <listitem>
-                <para>Click on the ECL IDE Installer link. When prompted save
-                this file to your PC and then run it—do not run directly from
-                your browser. This is a Windows installer for a Windows
-                application.</para>
+                <para>Click on the <emphasis role="bold">ECL IDE and Client
+                Tools </emphasis>link. </para>
               </listitem>
 
               <listitem>
-                <para>You can close your browser, if desired.</para>
+                <para>Follow the instructions on the web page to install the
+                ECL IDE. </para>
               </listitem>
 
               <listitem>
                 <para>Install the ECL IDE, following the prompts in the
-                installer. Once the ECL IDE is installed successfully, you can
-                proceed.</para>
+                installation program. Once the ECL IDE is installed
+                successfully, you can proceed.</para>
               </listitem>
             </orderedlist></para>
 
@@ -1039,7 +986,6 @@
                 </figure>
               </listitem>
 
-
               <listitem>
                 <para>Open a new <emphasis role="bold">Builder
                 Window</emphasis> (CTRL+N) and write the following
@@ -1262,8 +1208,7 @@
             button.</para>
 
             <para>Alternatively, you could find the IP addresses using Auto
-            Discovery by selecting the Auto Discovery button. (only avallable
-            in Enterprise Edition)</para>
+            Discovery by selecting the Auto Discovery button. </para>
 
             <para>Now you will define how many nodes to use for the Roxie and
             Thor clusters.</para>

docs/Installing_and_RunningTheHPCCPlatform/user_Sect.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1>
-  <title><emphasis role="bold">User Security Maintenance</emphasis></title>
+  <title>User Security Maintenance</title>
 
   <para>Configuring an HPCC System to use LDAP security will give you greater
   control over users and the security of your HPCC system.</para>
@@ -28,7 +28,8 @@
     feature. Permissions are separated into the following
     categories:<informaltable frame="all">
         <tgroup cols="2" colsep="1">
-           
+          <colspec colwidth="185pt" />
+
           <tbody>
             <row>
               <entry><emphasis role="bold">Esp Features for
@@ -297,7 +298,7 @@
             </listitem>
 
             <listitem>
-              <para>Click OK to confirm.</para>
+              <para>Click OK to confirm. </para>
 
               <para>Confirmation of the request is shown.</para>
             </listitem>
@@ -326,7 +327,7 @@
             </listitem>
 
             <listitem>
-              <para>Click <emphasis role="bold">Submit</emphasis>.</para>
+              <para>Click <emphasis role="bold">Submit</emphasis>. </para>
 
               <para>Confirmation of the request is shown.</para>
             </listitem>
@@ -346,7 +347,7 @@
             </listitem>
 
             <listitem>
-              <para>Click <emphasis role="bold">Delete</emphasis>.</para>
+              <para>Click <emphasis role="bold">Delete</emphasis>. </para>
 
               <para>Confirmation of the request is shown.</para>
             </listitem>
@@ -929,10 +930,8 @@
             </listitem>
 
             <listitem>
-              <para>Click OK to confirm.</para>
-
-              <para>Confirmation of your request is shown.<emphasis
-              role="bold"></emphasis></para>
+              <para>Click OK to confirm. Confirmation of your request is
+              shown.<emphasis role="bold"></emphasis></para>
             </listitem>
           </orderedlist></para>
       </sect4>
@@ -956,7 +955,12 @@
       <para>SMCAccess is required by all users to be able to successfully
       login to ECL Watch. <informaltable>
           <tgroup cols="3">
- 
+            <colspec colwidth="155pt" />
+
+            <colspec />
+
+            <colspec colwidth="85pt" />
+
             <thead>
               <row>
                 <entry>LDAP Path</entry>
@@ -994,7 +998,12 @@
 
       <para><informaltable>
           <tgroup cols="3">
-  
+            <colspec colwidth="155pt" />
+
+            <colspec />
+
+            <colspec colwidth="85pt" />
+
             <thead>
               <row>
                 <entry>LDAP Path</entry>
@@ -1073,6 +1082,11 @@
       contents of the workunits list reflects whether a user has the
       permission to view their own and others workunits.<informaltable>
           <tgroup cols="3">
+            <colspec colwidth="155pt" />
+
+            <colspec />
+
+            <colspec colwidth="85pt" />
 
             <thead>
               <row>
@@ -1145,7 +1159,12 @@
       disc space, CPU usage and access to logs as well as the ability to swap
       faulty nodes out of the cluster. <informaltable>
           <tgroup cols="3">
-   
+            <colspec colwidth="155pt" />
+
+            <colspec />
+
+            <colspec colwidth="85pt" />
+
             <thead>
               <row>
                 <entry>LDAP Path</entry>
@@ -1216,7 +1235,12 @@
       <para>A user must have permission to view DFU Workunits and requires
       other permissions to be able to manipulate them.<informaltable>
           <tgroup cols="3">
-       
+            <colspec colwidth="155pt" />
+
+            <colspec />
+
+            <colspec colwidth="85pt" />
+
             <thead>
               <row>
                 <entry>LDAP Path</entry>
@@ -1261,8 +1285,13 @@
       generated show where housekeeping is required on the cluster(s) and
       users require additional permission to use this feature. <informaltable>
           <tgroup cols="3">
-        
-             <thead>
+            <colspec colwidth="155pt" />
+
+            <colspec />
+
+            <colspec colwidth="85pt" />
+
+            <thead>
               <row>
                 <entry>LDAP Path</entry>
 
@@ -1396,8 +1425,12 @@
       <para>Additional permission is required to view roxie queries in ECL
       Watch.<informaltable>
           <tgroup cols="3">
-      
-          
+            <colspec colwidth="155pt" />
+
+            <colspec />
+
+            <colspec colwidth="85pt" />
+
             <thead>
               <row>
                 <entry>LDAP Path</entry>

docs/RuningHPCCinAmazonWebServicesEC2/AWSIncludes.xml

@@ -41,7 +41,7 @@
 
                 <mediaobject>
                   <imageobject>
-                    <imagedata fileref="images/AWS_Accesskey.jpg" />
+                    <imagedata fileref="../images/AWS_Accesskey.jpg" />
                   </imageobject>
                 </mediaobject>
               </figure></para>

docs/RuningHPCCinAmazonWebServicesEC2/One-Click_RuningHPCCinAmazonWebServicesEC2.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<book lang="en_US">
+<book lang="en_US" xml:base="../">
   <title>One-Click<trademark> Thor </trademark> within Amazon Web
   Services</title>
 
@@ -40,20 +40,22 @@
       example data used in this manual are fictitious. Any similarity to
       actual persons, living or dead, is purely coincidental.</para>
 
-      <para></para>
+      <para />
 
-      <para><emphasis role="redbold"></emphasis></para>
+      <para>
+        <emphasis role="redbold" />
+      </para>
     </legalnotice>
 
-    <xi:include href="Version.xml" xpointer="FooterInfo"
+    <xi:include href="common/Version.xml" xpointer="FooterInfo"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-    <xi:include href="Version.xml" xpointer="DateVer"
+    <xi:include href="common/Version.xml" xpointer="DateVer"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-    <corpname>HPCC Systems </corpname>
+    <corpname>HPCC Systems</corpname>
 
-    <xi:include href="Version.xml" xpointer="Copyright"
+    <xi:include href="common/Version.xml" xpointer="Copyright"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <mediaobject role="logo">
@@ -214,7 +216,8 @@
 
             <tbody>
               <row>
-                <entry><inlinegraphic fileref="images/OSSgr3.png" /></entry>
+                <entry><inlinegraphic
+                fileref="images/OSSgr3.png" /></entry>
 
                 <entry>For detailed PuTTY/pcsp/PUTTYGen directions from
                 Amazon, see: <para><ulink
@@ -247,7 +250,7 @@
 
       <!--Include follows-->
 
-      <xi:include href="AWSIncludes.xml" xpointer="Find_AWS_Keys"
+      <xi:include href="RuningHPCCinAmazonWebServicesEC2/AWSIncludes.xml" xpointer="Find_AWS_Keys"
                   xmlns:xi="http://www.w3.org/2001/XInclude" />
     </sect1>
 
@@ -347,8 +350,7 @@
         </listitem>
 
         <listitem>
-          <para>Installs HPCC Systems platform packages (required and optional
-          packages and their dependencies).</para>
+          <para>Installs HPCC Systems platform packages.</para>
         </listitem>
 
         <listitem>
@@ -427,8 +429,7 @@
             the SSH Key.</para>
 
             <para>It also has a link that allows you to <emphasis
-            role="bold">Terminate</emphasis> the cluster instantiation.
-            </para>
+            role="bold">Terminate</emphasis> the cluster instantiation.</para>
 
             <para><figure>
                 <title>View Clusters</title>
@@ -670,8 +671,8 @@
                         fileref="images/caution.png" /></entry>
 
                         <entry>Your IP address could be different from the
-                        ones provided in the example images. Please use the IP
-                        address of <emphasis role="bold">your</emphasis>
+                        ones provided in the example images. Please use the
+                        IP address of <emphasis role="bold">your</emphasis>
                         node.</entry>
                       </row>
                     </tbody>
@@ -683,8 +684,7 @@
               <?dbfo keep-together="always"?>
 
               <para>From ECL Watch page, click on the <emphasis
-              role="bold">Browse </emphasis>link under <emphasis
-              role="bold">Resources</emphasis> in the menu on the left
+              role="bold">Resources </emphasis> link in the menu on the left
               side.</para>
 
               <para><figure>
@@ -692,31 +692,28 @@
 
                   <mediaobject>
                     <imageobject>
-                      <imagedata fileref="images/vmimg07aa3.JPG" />
+                      <imagedata fileref="images/GS_1311.JPG" />
                     </imageobject>
                   </mediaobject>
                 </figure></para>
 
-              <para><emphasis role="bold">Note: The order of items on the page
-              may vary depending on the order in which optional packages are
-              installed.</emphasis></para>
+              <para>Follow the link to the HPCC System's portal.</para>
             </listitem>
 
             <listitem>
-              <para>Click on the <emphasis role="bold">ECL IDE
-              Installer</emphasis> link. When prompted, save this file to your
-              PC and then run it—do not run directly from your browser. This
-              is a Windows installer for a Windows application.</para>
+              <para>Click on the <emphasis role="bold">ECL IDE and Client
+              Tools </emphasis>link.</para>
             </listitem>
 
             <listitem>
-              <para>You can close your browser, if desired.</para>
+              <para>Follow the instructions on the web page to install the ECL
+              IDE.</para>
             </listitem>
 
             <listitem>
               <para>Install the ECL IDE, following the prompts in the
-              installer. Once the ECL IDE is installed successfully, you can
-              proceed.</para>
+              installation program. Once the ECL IDE is installed
+              successfully, you can proceed.</para>
             </listitem>
           </orderedlist></para>
       </sect2>
@@ -1383,7 +1380,7 @@ OUTPUT(ValidWords)
 
       <!--*** include follows-->
 
-      <xi:include href="AWSIncludes.xml" xpointer="Find_AWS_Keys"
+      <xi:include href="RuningHPCCinAmazonWebServicesEC2/AWSIncludes.xml" xpointer="Find_AWS_Keys"
                   xmlns:xi="http://www.w3.org/2001/XInclude" />
 
       <sect2>
@@ -1393,7 +1390,8 @@ OUTPUT(ValidWords)
         <para>To move files to or from S3 storage, the S3 packages must be
         installed and configured on your Landing Zone node.</para>
 
-        <para><orderedlist>
+        <para>
+          <orderedlist>
             <listitem>
               <para>Open a console window and connect to the Landing Zone (LZ)
               node</para>
@@ -1402,9 +1400,11 @@ OUTPUT(ValidWords)
             <listitem>
               <para>Run these commands:</para>
 
-              <para><programlisting>sudo apt-get install s3cmd
+              <para>
+                <programlisting>sudo apt-get install s3cmd
 s3cmd --configure
-</programlisting></para>
+</programlisting>
+              </para>
             </listitem>
 
             <listitem>
@@ -1453,7 +1453,8 @@ s3cmd --configure
               <para>Enter <emphasis role="bold">Yes</emphasis> to Save
               Settings</para>
             </listitem>
-          </orderedlist></para>
+          </orderedlist>
+        </para>
       </sect2>
 
       <sect2>
@@ -1473,20 +1474,26 @@ s3cmd --configure
         <sect3>
           <title>Create a bucket</title>
 
-          <para><programlisting>s3cmd mb s3://your-unique-bucket-name</programlisting></para>
+          <para>
+            <programlisting>s3cmd mb s3://your-unique-bucket-name</programlisting>
+          </para>
         </sect3>
 
         <sect3>
           <title>List Buckets</title>
 
-          <para><programlisting>s3cmd ls</programlisting></para>
+          <para>
+            <programlisting>s3cmd ls</programlisting>
+          </para>
         </sect3>
 
         <sect3>
           <title>Upload a file to a bucket</title>
 
-          <para><programlisting>s3cmd put myfile.csv s3://your-unique-bucket-name
-</programlisting></para>
+          <para>
+            <programlisting>s3cmd put myfile.csv s3://your-unique-bucket-name
+</programlisting>
+          </para>
         </sect3>
 
         <sect3>

docs/RuningHPCCinAmazonWebServicesEC2/RuningHPCCinAmazonWebServicesEC2.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<book lang="en_US">
+<book lang="en_US" xml:base="../">
   <title>Running the HPCC Systems Thor Platform within Amazon Web
   Services</title>
 
@@ -48,15 +48,15 @@
       <para><emphasis role="redbold">BETA 2</emphasis></para>
     </legalnotice>
 
-        <xi:include href="Version.xml" xpointer="FooterInfo"
+    <xi:include href="common/Version.xml" xpointer="FooterInfo"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-    <xi:include href="Version.xml" xpointer="DateVer"
+    <xi:include href="common/Version.xml" xpointer="DateVer"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <corpname>HPCC Systems</corpname>
 
-    <xi:include href="Version.xml" xpointer="Copyright"
+    <xi:include href="common/Version.xml" xpointer="Copyright"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <mediaobject role="logo">
@@ -365,7 +365,7 @@
                     <para>You can use EBS storage, but expect poorer
                     performance as EBS is not tuned for sequential access. See
                     <link linkend="ebs_answer">the FAQ section</link> for more
-                    details. </para>
+                    details.</para>
 
                     <para>Because of limitations for very large files in
                     certain fuse drivers, we do not recommend fuse drivers at
@@ -453,8 +453,8 @@
                   <listitem>
                     <para>Windows</para>
 
-                    <para>Use PuTTY, Pageant, and PuttyGen to SSH to the node.
-                    </para>
+                    <para>Use PuTTY, Pageant, and PuttyGen to SSH to the
+                    node.</para>
 
                     <para>See <ulink
                     url="http://docs.amazonwebservices.com/AmazonEC2/gsg/2006-06-26/putty.html">http://docs.amazonwebservices.com/AmazonEC2/gsg/2006-06-26/putty.html</ulink>
@@ -571,23 +571,23 @@ sudo /opt/HPCCSystems/sbin/configmgr</programlisting>
                         <tgroup cols="1">
                           <tbody>
                             <row>
-                              <entry>temp </entry>
+                              <entry>temp</entry>
                             </row>
 
                             <row>
-                              <entry>data </entry>
+                              <entry>data</entry>
                             </row>
 
                             <row>
-                              <entry>data2 </entry>
+                              <entry>data2</entry>
                             </row>
 
                             <row>
-                              <entry>data3 </entry>
+                              <entry>data3</entry>
                             </row>
 
                             <row>
-                              <entry>mirror </entry>
+                              <entry>mirror</entry>
                             </row>
 
                             <row>
@@ -1019,13 +1019,13 @@ sudo /opt/HPCCSystems/sbin/configmgr</programlisting>
                 </row>
 
                 <row>
-                  <entry>WsAtrtributes (Enterprise Edition)</entry>
+                  <entry>WsAtrtributes </entry>
 
                   <entry>8145</entry>
                 </row>
 
                 <row>
-                  <entry>Roxie Config (Enterprise Edition)</entry>
+                  <entry>Roxie Config </entry>
 
                   <entry>8050</entry>
                 </row>
@@ -1706,8 +1706,8 @@ sudo /opt/HPCCSystems/sbin/configmgr</programlisting>
               <listitem>
                 <para>Windows</para>
 
-                <para>Use PuTTY, Pageant, and PuttyGen to SSH to the node.
-                </para>
+                <para>Use PuTTY, Pageant, and PuttyGen to SSH to the
+                node.</para>
 
                 <para>See <ulink
                 url="http://docs.amazonwebservices.com/AmazonEC2/gsg/2006-06-26/putty.html">http://docs.amazonwebservices.com/AmazonEC2/gsg/2006-06-26/putty.html</ulink>
@@ -1768,8 +1768,8 @@ sudo /opt/HPCCSystems/sbin/configmgr</programlisting>
                 <listitem>
                   <para>Windows</para>
 
-                  <para>Use PuTTY, Pageant, and PuttyGen to SSH to the node.
-                  </para>
+                  <para>Use PuTTY, Pageant, and PuttyGen to SSH to the
+                  node.</para>
 
                   <para>See <ulink
                   url="http://docs.amazonwebservices.com/AmazonEC2/gsg/2006-06-26/putty.html">http://docs.amazonwebservices.com/AmazonEC2/gsg/2006-06-26/putty.html</ulink>
@@ -2151,8 +2151,7 @@ sudo /opt/HPCCSystems/sbin/configmgr</programlisting><emphasis></emphasis></para
               <?dbfo keep-together="always"?>
 
               <para>From ECL Watch page, click on the <emphasis
-              role="bold">Browse </emphasis>link under <emphasis
-              role="bold">Resources</emphasis> in the menu on the left
+              role="bold">Resources </emphasis> link in the menu on the left
               side.</para>
 
               <para><figure>
@@ -2160,31 +2159,28 @@ sudo /opt/HPCCSystems/sbin/configmgr</programlisting><emphasis></emphasis></para
 
                   <mediaobject>
                     <imageobject>
-                      <imagedata fileref="images/vmimg07aa3.JPG" />
+                      <imagedata fileref="images/GS_1311.JPG" />
                     </imageobject>
                   </mediaobject>
                 </figure></para>
 
-              <para><emphasis role="bold">Note: The order of items on the page
-              may vary depending on the order in which optional packages are
-              installed.</emphasis></para>
+              <para>Follow the link to the HPCC System's portal.</para>
             </listitem>
 
             <listitem>
-              <para>Click on the <emphasis role="bold">ECL IDE
-              Installer</emphasis> link. When prompted, save this file to your
-              PC and then run it—do not run directly from your browser. This
-              is a Windows installer for a Windows application.</para>
+              <para>Click on the <emphasis role="bold">ECL IDE and Client
+              Tools </emphasis>link.</para>
             </listitem>
 
             <listitem>
-              <para>You can close your browser, if desired.</para>
+              <para>Follow the instructions on the web page to install the ECL
+              IDE.</para>
             </listitem>
 
             <listitem>
               <para>Install the ECL IDE, following the prompts in the
-              installer. Once the ECL IDE is installed successfully, you can
-              proceed.</para>
+              installation program. Once the ECL IDE is installed
+              successfully, you can proceed.</para>
             </listitem>
           </orderedlist></para>
       </sect2>
@@ -3250,9 +3246,8 @@ s3cmd --configure
           </question>
 
           <answer>
-            <para>The Community Edition offers peer support in the Forums on
-            the HPCC Systems Portal. Enterprise Edition Packages include
-            expert support.</para>
+            <para>Peer support is available in the Forums on the HPCC Systems
+            Portal. </para>
           </answer>
         </qandaentry>
 

ecl/ecl-package/ecl-package.cpp

@@ -564,7 +564,7 @@ public:
             }
             if (iter.matchOption(optProcess, ECLOPT_PROCESS))
                 continue;
-            if (iter.matchFlag(optDaliIp, ECLOPT_DALIIP))
+            if (iter.matchOption(optDaliIp, ECLOPT_DALIIP))
                 continue;
             if (iter.matchFlag(optOverWrite, ECLOPT_OVERWRITE))
                 continue;

esp/services/ws_packageprocess/ws_packageprocessService.cpp

@@ -565,7 +565,7 @@ bool CWsPackageProcessEx::onCopyFiles(IEspContext &context, IEspCopyFilesRequest
     context.getServAddress(host, port);
 
     Owned<IPropertyTree> packageTree = createPTreeFromXMLString(info.str());
-    copyPackageSubFiles(LINK(packageTree), process, lookupDaliIp, req.getOverWrite(), userdesc, host, port);
+    copyPackageSubFiles(LINK(packageTree), process, lookupDaliIp.get(), req.getOverWrite(), userdesc, host, port);
 
     StringBuffer msg;
     msg.append("Successfully loaded ").append(pkgName.get());

thorlcr/graph/thgraph.cpp

@@ -715,20 +715,12 @@ void CGraphElementBase::initActivity()
     if (activity)
         return;
     activity.setown(factory());
-    switch (getKind())
+    if (isLoopActivity(*this))
     {
-        case TAKlooprow:
-        case TAKloopcount:
-        case TAKloopdataset:
-        case TAKgraphloop:
-        case TAKparallelgraphloop:
-        {
-            unsigned loopId = queryXGMML().getPropInt("att[@name=\"_loopid\"]/@value");
-            Owned<CGraphBase> childGraph = owner->getChildGraph(loopId);
-            Owned<IThorBoundLoopGraph> boundLoopGraph = createBoundLoopGraph(childGraph, baseHelper->queryOutputMeta(), queryId());
-            setBoundGraph(boundLoopGraph);
-            break;
-        }
+        unsigned loopId = queryXGMML().getPropInt("att[@name=\"_loopid\"]/@value");
+        Owned<CGraphBase> childGraph = owner->getChildGraph(loopId);
+        Owned<IThorBoundLoopGraph> boundLoopGraph = createBoundLoopGraph(childGraph, baseHelper->queryOutputMeta(), queryId());
+        setBoundGraph(boundLoopGraph);
     }
 }
 
@@ -1004,6 +996,19 @@ bool isGlobalActivity(CGraphElementBase &container)
     return false;
 }
 
+bool isLoopActivity(CGraphElementBase &container)
+{
+    switch (container.getKind())
+    {
+        case TAKlooprow:
+        case TAKloopcount:
+        case TAKloopdataset:
+        case TAKgraphloop:
+        case TAKparallelgraphloop:
+            return true;
+    }
+    return false;
+}
 /////
 
 CGraphBase::CGraphBase(CJobBase &_job) : job(_job)
@@ -1344,6 +1349,15 @@ void CGraphBase::done()
     }
 }
 
+bool CGraphBase::syncInitData()
+{
+    CGraphElementBase *parentElement = queryOwner() ? queryOwner()->queryElement(queryParentActivityId()) : NULL;
+    if (parentElement && isLoopActivity(*parentElement))
+        return parentElement->queryLoopGraph()->queryGraph()->isGlobal();
+    else
+        return !isLocalChild();
+}
+
 void CGraphBase::end()
 {
 // always called, any final action clear up
@@ -1667,22 +1681,10 @@ void CGraphBase::createFromXGMML(IPropertyTree *_node, CGraphBase *_owner, CGrap
     {
         CGraphElementBase *parentElement = owner->queryElement(parentActivityId);
         parentElement->addAssociatedChildGraph(this);
-        switch (parentElement->getKind())
-        {
-            case TAKlooprow:
-            case TAKloopcount:
-            case TAKloopdataset:
-            case TAKgraphloop:
-            case TAKparallelgraphloop:
-            {
-                if (parentElement->queryOwner().isLocalChild())
-                    localChild = true;
-                break;
-            }
-            default:
-                localChild = true;
-                break;
-        }
+        if (isLoopActivity(*parentElement))
+            localChild = parentElement->queryOwner().isLocalChild();
+        else
+            localChild = true;
     }
 
     Owned<IPropertyTreeIterator> nodes = xgmml->getElements("node");
@@ -2491,18 +2493,10 @@ void CJobBase::addDependencies(IPropertyTree *xgmml, bool failIfMissing)
         if (subGraph.queryOwner() && subGraph.queryParentActivityId())
         {
             CGraphElementBase *parentElement = subGraph.queryOwner()->queryElement(subGraph.queryParentActivityId());
-            switch (parentElement->getKind())
+            if (isLoopActivity(*parentElement))
             {
-                case TAKlooprow:
-                case TAKloopcount:
-                case TAKloopdataset:
-                case TAKgraphloop:
-                case TAKparallelgraphloop:
-                {
-                    if (!parentElement->queryOwner().isLocalChild() && !subGraph.isLocalOnly())
-                        subGraph.setGlobal(true);
-                    break;
-                }
+                if (!parentElement->queryOwner().isLocalChild() && !subGraph.isLocalOnly())
+                    subGraph.setGlobal(true);
             }
         }
         bool log = queryForceLogging(subGraph.queryGraphId(), subGraph.isGlobal());

thorlcr/graph/thgraph.hpp

@@ -287,7 +287,6 @@ public:
     IThorGraphDependencyIterator *getDependsIterator() const;
     void ActPrintLog(const char *format, ...)  __attribute__((format(printf, 2, 3)));
     void ActPrintLog(IException *e, const char *format, ...) __attribute__((format(printf, 3, 4)));
-
     void setBoundGraph(IThorBoundLoopGraph *graph) { loopGraph.set(graph); }
     IThorBoundLoopGraph *queryLoopGraph() { return loopGraph; }
     bool executeDependencies(size32_t parentExtractSz, const byte *parentExtract, int controlId, bool async);
@@ -619,6 +618,7 @@ public:
     IGraphTempHandler *queryTempHandler() const { assertex(tmpHandler.get()); return tmpHandler; }
     CGraphBase *queryOwner() { return owner; }
     CGraphBase *queryParent() { return parent?parent:this; }
+    bool syncInitData();
     bool isComplete() const { return complete; }
     bool isPrepared() const { return prepared; }
     bool isGlobal() const { return global; }
@@ -1135,6 +1135,7 @@ extern graph_decl void registerCreateFunc(CreateFunc func);
 extern graph_decl CGraphElementBase *createGraphElement(IPropertyTree &node, CGraphBase &owner, CGraphBase *resultsGraph);
 extern graph_decl IThorBoundLoopGraph *createBoundLoopGraph(CGraphBase *graph, IOutputMetaData *resultMeta, unsigned activityId);
 extern graph_decl bool isDiskInput(ThorActivityKind kind);
+extern graph_decl bool isLoopActivity(CGraphElementBase &container);
 
 
 #endif

thorlcr/graph/thgraphmaster.cpp

@@ -2333,7 +2333,8 @@ bool CMasterGraph::preStart(size32_t parentExtractSz, const byte *parentExtract)
             throw;
         }
     }
-    if (!queryOwner() || isGlobal())
+
+    if (syncInitData())
         sendActivityInitData(); // has to be done at least once
     CGraphBase::preStart(parentExtractSz, parentExtract);
     if (isGlobal())

thorlcr/graph/thgraphslave.cpp

@@ -383,7 +383,8 @@ bool CSlaveGraph::recvActivityInitData()
         CMessageBuffer actInitRtnData;
         actInitRtnData.append(false);
         CMessageBuffer msg;
-        if (!queryOwner() || isGlobal())
+
+        if (syncInitData())
         {
             if (!job.queryJobComm().recv(msg, 0, mpTag, NULL, LONGTIMEOUT))
                 throw MakeStringException(0, "Error receiving actinit data for graph: %"GIDPF"d", graphId);