Merge remote-tracking branch 'origin/candidate-9.4.x' into candidate-…

…9.4.0

Signed-off-by: Gordon Smith <[email protected]>

common/dllserver/dllserver.cpp

@@ -503,7 +503,7 @@ void DllServer::doRegisterDll(const char * name, const char * kind, const char *
     RemoteFilename dllRemote;
     StringBuffer ipText, dllText;
     dllRemote.setRemotePath(dllPath);
-    dllRemote.queryIP().getIpText(ipText);
+    dllRemote.queryIP().getHostText(ipText);
     dllRemote.getLocalPath(dllText);
 
     Owned<IRemoteConnection> conn = getEntryConnection(name, RTM_LOCK_WRITE);

common/environment/dalienv.cpp

@@ -113,7 +113,7 @@ EnvMachineOS queryOS(const IpAddress & ip)
         Owned<IEnvironmentFactory> factory = getEnvironmentFactory(true);
         Owned<IConstEnvironment> env = factory->openEnvironment();
         StringBuffer ipText;
-        ip.getIpText(ipText);
+        ip.getHostText(ipText);
         Owned<IConstMachineInfo> machine = env->getMachineByAddress(ipText.str());
         if (machine)
             ret = machine->getOS();
@@ -226,7 +226,7 @@ const char * querySlaveExecutable(const char * keyName, const char * exeName, co
     Owned<IEnvironmentFactory> factory = getEnvironmentFactory(true);
     Owned<IConstEnvironment> env = factory->openEnvironment();
     StringBuffer addr;
-    ip.getIpText(addr);
+    ip.getHostText(addr);
 
     StringBufferAdaptor spp(progpath);
     StringBufferAdaptor swd(workdir);
@@ -264,10 +264,10 @@ bool getRemoteRunInfo(const char * keyName, const char * exeName, const char * v
     // use dafilesrv to work out OS
     StringBuffer dalis;
     if (remotedali)
-        remotedali->endpoint().getUrlStr(dalis);
+        remotedali->endpoint().getEndpointHostText(dalis);
     // first get machine by IP
     StringBuffer ips;
-    ip.getIpText(ips);
+    ip.getHostText(ips);
 
     //Cannot use getEnvironmentFactory() since it is using a remotedali
     StringBuffer xpath;

common/environment/environment.cpp

@@ -1972,7 +1972,7 @@ IConstDropZoneInfo * CLocalEnvironment::getDropZoneByAddressPath(const char * ne
 
 #ifdef _DEBUG
                 StringBuffer serverIpString;
-                serverIP.getIpText(serverIpString);
+                serverIP.getHostText(serverIpString);
                 LOG(MCdebugInfo, unknownJob, "Listed server: '%s', IP: '%s'", dropzoneServer.str(), serverIpString.str());
 #endif
                 if (strisame(netaddress, dropzoneServer) || targetIp.ipequals(serverIP))

common/pkgfiles/referencedfilelist.cpp

@@ -423,7 +423,7 @@ IPropertyTree *ReferencedFile::getSpecifiedOrRemoteFileTree(IUserDescriptor *use
     if (!fileTree)
         return NULL;
     StringAttrBuilder daliipText(daliip);
-    remote->endpoint().getUrlStr(daliipText);
+    remote->endpoint().getEndpointHostText(daliipText);
     filePrefix.set(remotePrefix);
     return fileTree.getClear();
 }
@@ -471,7 +471,7 @@ void ReferencedFile::resolveRemote(IUserDescriptor *user, INode *remote, const c
     flags |= RefFileNotFound;
 
     StringBuffer dest;
-    DBGLOG("Remote ReferencedFile not found %s [dali=%s, remote=%s, prefix=%s]", logicalName.str(), daliip.get(), remote ? remote->endpoint().getUrlStr(dest).str() : nullptr, remotePrefix);
+    DBGLOG("Remote ReferencedFile not found %s [dali=%s, remote=%s, prefix=%s]", logicalName.str(), daliip.get(), remote ? remote->endpoint().getEndpointHostText(dest).str() : nullptr, remotePrefix);
 }
 
 void ReferencedFile::resolve(const StringArray &locations, const char *srcCluster, IUserDescriptor *user, INode *remote, const char *remotePrefix, bool checkLocalFirst, StringArray *subfiles, bool _trackSubFiles, bool resolveForeign)
@@ -1025,7 +1025,7 @@ void ReferencedFileList::cloneRelationships()
         return;
 
     StringBuffer addr;
-    remote->endpoint().getUrlStr(addr);
+    remote->endpoint().getEndpointHostText(addr);
     IDistributedFileDirectory &dir = queryDistributedFileDirectory();
     ReferencedFileIterator files(this);
     ForEach(files)

common/remote/rmtspawn.cpp

@@ -111,7 +111,7 @@ ISocket *spawnRemoteChild(SpawnKind kind, const char * exe, const SocketEndpoint
     unsigned port = SLAVE_CONNECT_PORT + ((unsigned)kind * NUM_SLAVE_CONNECT_PORT) + getRandom() % NUM_SLAVE_CONNECT_PORT;
     StringBuffer args;
 
-    myEP.getUrlStr(args);
+    myEP.getEndpointHostText(args);
     args.append(' ').append(replyTag).append(' ').append((unsigned)kind).append(" ").append(port);
     if (extra)
         args.append(' ').append(extra);
@@ -177,7 +177,7 @@ ISocket *spawnRemoteChild(SpawnKind kind, const char * exe, const SocketEndpoint
         try
         {
             StringBuffer tmp;
-            connectEP.getUrlStr(tmp);
+            connectEP.getEndpointHostText(tmp);
             LOG(MCdetailDebugInfo, unknownJob, "Try to connect to slave %s",tmp.str());
             Owned<ISocket> socket = ISocket::connect_wait(connectEP,MASTER_CONNECT_SLAVE_TIMEOUT);
             if (socket)
@@ -288,7 +288,7 @@ bool CRemoteParentInfo::processCommandLine(int argc, const char * * argv, String
 void CRemoteParentInfo::log()
 {
     StringBuffer temp;
-    LOG(MCdebugProgress, unknownJob, "Starting remote slave.  Master=%s reply=%d port=%d", parent.getUrlStr(temp).str(), replyTag, port);
+    LOG(MCdebugProgress, unknownJob, "Starting remote slave.  Master=%s reply=%d port=%d", parent.getEndpointHostText(temp).str(), replyTag, port);
 }
 
 bool CRemoteParentInfo::sendReply(unsigned version)
@@ -331,7 +331,7 @@ bool CRemoteParentInfo::sendReply(unsigned version)
                         if (version == connectVersion)
                         {
                             buffer.read(connectTag);
-                            masterIP.getIpText(masterIPtext.clear());
+                            masterIP.getHostText(masterIPtext.clear());
 
                             LOG(MCdetailDebugInfo, unknownJob, "Process incoming connection. reply=%d got(%d,%s)", replyTag,connectTag,masterIPtext.str());
 

common/remote/rmtssh.cpp

@@ -136,7 +136,7 @@ class CFRunSSH: public CInterface, implements IFRunSSH
                 if (sa.ordinality()) {
                     StringBuffer ns;
                     ForEachItemIn(i,sa) {
-                        sa.item(i).getIpText(ns.clear());
+                        sa.item(i).getHostText(ns.clear());
                         slaves.append(ns.str());
                     }
                     return;
@@ -548,7 +548,7 @@ class CFRunSSH: public CInterface, implements IFRunSSH
         strict = false;
         verbose = false;
         StringBuffer ips;
-        ip.getIpText(ips);
+        ip.getHostText(ips);
         slaves.kill();
         slaves.append(ips.str());
         numthreads = 1;

common/roxiecommlib/roxiecommunicationclient.cpp

@@ -232,7 +232,7 @@ class CRoxieCommunicationClient: implements IRoxieCommunicationClient, public CI
             if (remoteIP)
                 buf.append(remoteIP);
             else
-                ep.getUrlStr(buf);
+                ep.getEndpointHostText(buf);
 
             throw MakeStringException(ROXIECOMM_SOCKET_ERROR, "%s", buf.str());
         }

common/thorhelper/persistent.cpp

@@ -56,7 +56,7 @@ class CPersistentInfo : implements IInterface, public CInterface
     {
         if(_ep)
         {
-            _ep->getUrlStr(epstr);
+            _ep->getEndpointHostText(epstr);
             keystr.set(epstr);
             addKeySuffix(proto, keystr);
         }
@@ -121,7 +121,7 @@ class CAvailKeeper
 private:
     inline StringBuffer& calcKey(SocketEndpoint& ep, PersistentProtocol proto, StringBuffer& keystr)
     {
-        ep.getUrlStr(keystr);
+        ep.getEndpointHostText(keystr);
         return addKeySuffix(proto, keystr);
     }
     SocketSet* findSet(CPersistentInfo* info, bool create = false)
@@ -214,7 +214,7 @@ class CPersistentHandler : implements IPersistentHandler, implements ISocketSele
         if (m_enableDoNotReuseList && ep != nullptr)
         {
             StringBuffer epstr;
-            ep->getUrlStr(epstr);
+            ep->getEndpointHostText(epstr);
             if(m_doNotReuseList.getValue(epstr.str()) != nullptr)
             {
                 PERSILOG(PersistentLogLevel::PLogNormal, "PERSISTENT: socket %d's target endpoint %s is in DoNotReuseList, will not add it.", sock->OShandle(), epstr.str());
@@ -434,7 +434,7 @@ class CPersistentHandler : implements IPersistentHandler, implements ISocketSele
         if(!ep)
             return false;
         StringBuffer epstr;
-        ep->getUrlStr(epstr);
+        ep->getEndpointHostText(epstr);
         if(epstr.length()> 0 && m_doNotReuseList.getValue(epstr.str()) != nullptr)
             return true;
         return false;