Merge pull request #12506 from richardkchapman/roxie-debug

HPCC-19987 Roxie Debugger issues

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>

common/workunit/workunit.cpp

@@ -12411,29 +12411,38 @@ extern WORKUNIT_API bool secDebugWorkunit(const char * wuid, ISecManager &secmgr
         Owned<IConstWorkUnit> wu = factory->openWorkUnit(wuid, &secmgr, &secuser);
         SCMStringBuffer ip;
         unsigned port;
-        port = wu->getDebugAgentListenerPort();
-        wu->getDebugAgentListenerIP(ip);
-        SocketEndpoint debugEP(ip.str(), port);
-        Owned<ISocket> socket = ISocket::connect_timeout(debugEP, 1000);
-        unsigned len = (size32_t)strlen(command);
-        unsigned revlen = len;
-        _WINREV(revlen);
-        socket->write(&revlen, sizeof(revlen));
-        socket->write(command, len);
-        for (;;)
+        try
         {
-            socket->read(&len, sizeof(len));
-            _WINREV(len);                    
-            if (len == 0)
-                break;
-            if (len & 0x80000000)
+            port = wu->getDebugAgentListenerPort();
+            wu->getDebugAgentListenerIP(ip);
+            SocketEndpoint debugEP(ip.str(), port);
+            Owned<ISocket> socket = ISocket::connect_timeout(debugEP, 1000);
+            unsigned len = (size32_t)strlen(command);
+            unsigned revlen = len;
+            _WINREV(revlen);
+            socket->write(&revlen, sizeof(revlen));
+            socket->write(command, len);
+            for (;;)
             {
-                throwUnexpected();
+                socket->read(&len, sizeof(len));
+                _WINREV(len);
+                if (len == 0)
+                    break;
+                if (len & 0x80000000)
+                {
+                    throwUnexpected();
+                }
+                char * mem = (char*) response.reserve(len);
+                socket->read(mem, len);
             }
-            char * mem = (char*) response.reserve(len);
-            socket->read(mem, len);
+            return true;
+        }
+        catch (IException *E)
+        {
+            VStringBuffer msg("In secDebugWorkunit wuid %s port %d ip %s command %s", wuid, port, ip.str(), command);
+            EXCLOG(E, msg.str());
+            throw;
         }
-        return true;
     }
     return false;
 }

roxie/ccd/ccdcontext.cpp

@@ -2786,8 +2786,8 @@ protected:
 
     void initDebugMode(bool breakAtStart, const char *debugUID)
     {
-        if (!debugPermitted || !ownEP.port || !nativeProtocol)
-            throw MakeStringException(ROXIE_ACCESS_ERROR, "Debug queries are not permitted on this system");
+        if (!debugPermitted || !ownEP.port || nativeProtocol)
+            throw MakeStringException(ROXIE_ACCESS_ERROR, "Debug query not permitted here");
         debugContext.setown(new CRoxieServerDebugContext(this, logctx, factory->cloneQueryXGMML()));
         debugContext->debugInitialize(debugUID, factory->queryQueryName(), breakAtStart);
         if (workUnit)

roxie/ccd/ccdprotocol.cpp

@@ -1889,7 +1889,8 @@ readAnother:
                     }
                 }
 
-                msgctx->initQuery(querySetName, queryName); //needed here to allow checking hash options
+                if (!streq(queryPrefix.str(), "debug"))
+                    msgctx->initQuery(querySetName, queryName); //needed here to allow checking hash options
 
                 if (whitespace == WhiteSpaceHandling::Default) //value in the request wins
                     whitespace = msgctx->getStripWhitespace() ? WhiteSpaceHandling::Strip : WhiteSpaceHandling::Preserve; //might be changed by hash option, returns default otherwise
@@ -1935,109 +1936,111 @@ readAnother:
                     sink->onDebugMsg(msgctx, uid, queryPT, out);
                     response.append(out.str());
                 }
-
-                Owned<IActiveQueryLimiter> l;
-                if (queryLimiterFactory)
-                    l.setown(queryLimiterFactory->create(listener));
-                if (l && !l->isAccepted())
+                else
                 {
-                    if (isHTTP)
+                    Owned<IActiveQueryLimiter> l;
+                    if (queryLimiterFactory)
+                        l.setown(queryLimiterFactory->create(listener));
+                    if (l && !l->isAccepted())
                     {
-                        sendHttpServerTooBusy(*client, logctx);
-                        logctx.CTXLOG("FAILED: %s", sanitizedText.str());
-                        logctx.CTXLOG("EXCEPTION: Too many active queries");
+                        if (isHTTP)
+                        {
+                            sendHttpServerTooBusy(*client, logctx);
+                            logctx.CTXLOG("FAILED: %s", sanitizedText.str());
+                            logctx.CTXLOG("EXCEPTION: Too many active queries");
+                        }
+                        else
+                        {
+                            IException *e = MakeStringException(ROXIE_TOO_MANY_QUERIES, "Too many active queries");
+                            if (msgctx->trapTooManyActiveQueries())
+                                logctx.logOperatorException(e, __FILE__, __LINE__, NULL);
+                            throw e;
+                        }
                     }
                     else
                     {
-                        IException *e = MakeStringException(ROXIE_TOO_MANY_QUERIES, "Too many active queries");
-                        if (msgctx->trapTooManyActiveQueries())
-                            logctx.logOperatorException(e, __FILE__, __LINE__, NULL);
-                        throw e;
-                    }
-                }
-                else
-                {
-                    int bindCores = queryPT->getPropInt("@bindCores", msgctx->getBindCores());
-                    if (bindCores > 0)
-                        listener->setThreadAffinity(bindCores);
-                    IArrayOf<IPropertyTree> requestArray;
-                    if (isHTTP)
-                    {
-                        if (isRequestArray)
+                        int bindCores = queryPT->getPropInt("@bindCores", msgctx->getBindCores());
+                        if (bindCores > 0)
+                            listener->setThreadAffinity(bindCores);
+                        IArrayOf<IPropertyTree> requestArray;
+                        if (isHTTP)
                         {
-                            StringBuffer reqIterString;
-                            reqIterString.append(queryName).append("Request");
+                            if (isRequestArray)
+                            {
+                                StringBuffer reqIterString;
+                                reqIterString.append(queryName).append("Request");
 
-                            Owned<IPropertyTreeIterator> reqIter = queryPT->getElements(reqIterString.str());
-                            ForEach(*reqIter)
+                                Owned<IPropertyTreeIterator> reqIter = queryPT->getElements(reqIterString.str());
+                                ForEach(*reqIter)
+                                {
+                                    IPropertyTree *fixedreq = createPTree(queryName, ipt_caseInsensitive|ipt_fast);
+                                    Owned<IPropertyTreeIterator> iter = reqIter->query().getElements("*");
+                                    ForEach(*iter)
+                                    {
+                                        fixedreq->addPropTree(iter->query().queryName(), LINK(&iter->query()));
+                                    }
+                                    requestArray.append(*fixedreq);
+                                }
+                            }
+                            else
                             {
                                 IPropertyTree *fixedreq = createPTree(queryName, ipt_caseInsensitive|ipt_fast);
-                                Owned<IPropertyTreeIterator> iter = reqIter->query().getElements("*");
+                                Owned<IPropertyTreeIterator> iter = queryPT->getElements("*");
                                 ForEach(*iter)
                                 {
                                     fixedreq->addPropTree(iter->query().queryName(), LINK(&iter->query()));
                                 }
                                 requestArray.append(*fixedreq);
+
+                                msgctx->setIntercept(queryPT->getPropBool("@log", false));
+                                msgctx->setTraceLevel(queryPT->getPropInt("@traceLevel", logctx.queryTraceLevel()));
                             }
+                            if (httpHelper.getTrim())
+                                protocolFlags |= HPCC_PROTOCOL_TRIM;
                         }
                         else
                         {
-                            IPropertyTree *fixedreq = createPTree(queryName, ipt_caseInsensitive|ipt_fast);
-                            Owned<IPropertyTreeIterator> iter = queryPT->getElements("*");
-                            ForEach(*iter)
+                            const char *format = queryPT->queryProp("@format");
+                            if (format)
                             {
-                                fixedreq->addPropTree(iter->query().queryName(), LINK(&iter->query()));
+                                if (stricmp(format, "raw") == 0)
+                                {
+                                    protocolFlags |= HPCC_PROTOCOL_NATIVE_RAW;
+                                    if (client) //not stand alone roxie exe
+                                        protocolFlags |= HPCC_PROTOCOL_BLOCKED;
+                                    mlResponseFmt = MarkupFmt_Unknown;
+                                }
+                                else if (stricmp(format, "bxml") == 0)
+                                {
+                                    protocolFlags |= HPCC_PROTOCOL_BLOCKED;
+                                    mlResponseFmt = MarkupFmt_XML;
+                                }
+                                else if (stricmp(format, "ascii") == 0)
+                                {
+                                    protocolFlags |= HPCC_PROTOCOL_NATIVE_ASCII;
+                                    mlResponseFmt = MarkupFmt_Unknown;
+                                }
+                                else if (stricmp(format, "xml") != 0) // xml is the default
+                                    throw MakeStringException(ROXIE_INVALID_INPUT, "Unsupported format specified: %s", format);
                             }
-                            requestArray.append(*fixedreq);
-
+                            if (queryPT->getPropBool("@trim", false))
+                                protocolFlags |= HPCC_PROTOCOL_TRIM;
                             msgctx->setIntercept(queryPT->getPropBool("@log", false));
                             msgctx->setTraceLevel(queryPT->getPropInt("@traceLevel", logctx.queryTraceLevel()));
                         }
-                        if (httpHelper.getTrim())
-                            protocolFlags |= HPCC_PROTOCOL_TRIM;
-                    }
-                    else
-                    {
-                        const char *format = queryPT->queryProp("@format");
-                        if (format)
-                        {
-                            if (stricmp(format, "raw") == 0)
-                            {
-                                protocolFlags |= HPCC_PROTOCOL_NATIVE_RAW;
-                                if (client) //not stand alone roxie exe
-                                    protocolFlags |= HPCC_PROTOCOL_BLOCKED;
-                                mlResponseFmt = MarkupFmt_Unknown;
-                            }
-                            else if (stricmp(format, "bxml") == 0)
-                            {
-                                protocolFlags |= HPCC_PROTOCOL_BLOCKED;
-                                mlResponseFmt = MarkupFmt_XML;
-                            }
-                            else if (stricmp(format, "ascii") == 0)
-                            {
-                                protocolFlags |= HPCC_PROTOCOL_NATIVE_ASCII;
-                                mlResponseFmt = MarkupFmt_Unknown;
-                            }
-                            else if (stricmp(format, "xml") != 0) // xml is the default
-                                throw MakeStringException(ROXIE_INVALID_INPUT, "Unsupported format specified: %s", format);
-                        }
-                        if (queryPT->getPropBool("@trim", false))
-                            protocolFlags |= HPCC_PROTOCOL_TRIM;
-                        msgctx->setIntercept(queryPT->getPropBool("@log", false));
-                        msgctx->setTraceLevel(queryPT->getPropInt("@traceLevel", logctx.queryTraceLevel()));
-                    }
 
-                    msgctx->noteQueryActive();
+                        msgctx->noteQueryActive();
 
-                    if (isHTTP)
-                    {
-                        CHttpRequestAsyncFor af(queryName, sink, msgctx, requestArray, *client, httpHelper, protocolFlags, memused, slavesReplyLen, sanitizedText, logctx, (PTreeReaderOptions)readFlags, querySetName);
-                        af.For(requestArray.length(), global->numRequestArrayThreads);
-                    }
-                    else
-                    {
-                        Owned<IHpccProtocolResponse> protocol = createProtocolResponse(queryPT->queryName(), client, httpHelper, logctx, protocolFlags, (PTreeReaderOptions)readFlags);
-                        sink->onQueryMsg(msgctx, queryPT, protocol, protocolFlags, (PTreeReaderOptions)readFlags, querySetName, 0, memused, slavesReplyLen);
+                        if (isHTTP)
+                        {
+                            CHttpRequestAsyncFor af(queryName, sink, msgctx, requestArray, *client, httpHelper, protocolFlags, memused, slavesReplyLen, sanitizedText, logctx, (PTreeReaderOptions)readFlags, querySetName);
+                            af.For(requestArray.length(), global->numRequestArrayThreads);
+                        }
+                        else
+                        {
+                            Owned<IHpccProtocolResponse> protocol = createProtocolResponse(queryPT->queryName(), client, httpHelper, logctx, protocolFlags, (PTreeReaderOptions)readFlags);
+                            sink->onQueryMsg(msgctx, queryPT, protocol, protocolFlags, (PTreeReaderOptions)readFlags, querySetName, 0, memused, slavesReplyLen);
+                        }
                     }
                 }
             }