Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HPCC-11637 Avoid multiple concourrent ECLWatch onActivity queries #6116

Merged
merged 3 commits into from Jun 24, 2014

Conversation

@wangkx
Copy link
Member

wangkx commented Jun 23, 2014

Use getActivityInfo() to collect activity info into a cache. Reuse
cached info to set concurrent onActivity queries. The cache time
is configurable (default to 10 seconds).

The code merged from 5.0: Upgrade code to display HPCC server even
if there is no workunit on the server. A user may pause or resume
the server. Collect network address and port info for identifying
ECLCCServer, etc.

wangkx added 2 commits Jun 20, 2014
Use getActivityInfo() to collect activity info into a cache. Reuse
cached info to set concurrent onActivity queries. The cache time
is configurable (default to 10 seconds).

The code merged from 5.0: Upgrade code to display HPCC server even
if there is no workunit on the server. A user may pause or resume
the server. Collect network address and port info for identifying
ECLCCServer, etc.

Signed-off-by: wangkx <kevin.wang@lexisnexis.com>
The version number should match with 5.0.

Signed-off-by: wangkx <kevin.wang@lexisnexis.com>
@wangkx wangkx changed the title H11637 Avoid multiple concourrent ECLWatch onActivity queries HPCC-11637 Avoid multiple concourrent ECLWatch onActivity queries Jun 23, 2014
SCMStringBuffer stateEx;
setExtra(wu->getStateEx(stateEx).str());
stateStr.appendf(" %s", stateEx.str());
wu->getStateEx(stateEx);

This comment has been minimized.

Copy link
@ghalliday

ghalliday Jun 23, 2014

Member

This contains a tab character which makes it tricky to merge

IPropertyTree* dfuRecoveryRoot = NULL;
Owned<IRemoteConnection> connDFURecovery = querySDS().connect("DFU/RECOVERY",myProcessSession(), RTM_LOCK_READ, 30000);
if (connDFURecovery)
dfuRecoveryRoot = connDFURecovery->queryRoot();

This comment has been minimized.

Copy link
@ghalliday

ghalliday Jun 23, 2014

Member

another tab

jobQueue->setQueueStatus(status);
if (version >= 1.17)
jobQueue->setStatusDetails(queueState.str());
setServerJobQueueStatusDetails(jobQueue, status, details);

This comment has been minimized.

Copy link
@ghalliday

ghalliday Jun 23, 2014

Member

another tab

@@ -107,6 +107,15 @@ ESPStruct ServerJobQueue
string ServerType;
string QueueStatus;
[min_ver("1.17")] string StatusDetails;
[min_ver("1.19")] string NetworkAddress;
[min_ver("1.19")] int port;

This comment has been minimized.

Copy link
@ghalliday

ghalliday Jun 23, 2014

Member

I think this should be capital "Port" to avoid merge conflicts.

Signed-off-by: wangkx <kevin.wang@lexisnexis.com>
richardkchapman added a commit that referenced this pull request Jun 24, 2014
HPCC-11637 Avoid multiple concourrent ECLWatch onActivity queries

Reviewed-By: Gavin Halliday <gavin.halliday@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
@richardkchapman richardkchapman merged commit 2c34bd3 into hpcc-systems:candidate-4.2.6 Jun 24, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.