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.

Sign up for GitHub

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

Jump to bottom

HPCC-20504 Add dafilesrv reply errors codes and normalize json response/specialize testsocket response #11688

Merged
merged 1 commit into from Sep 10, 2018
Merged

HPCC-20504 Add dafilesrv reply errors codes and normalize json response/specialize testsocket response #11688

merged 1 commit into from Sep 10, 2018

Conversation

jakesmith
Copy link
Member

@jakesmith jakesmith commented Sep 10, 2018 •
edited

Also make JSON request response standard/differentiate with
special handling of testsocket client.

Signed-off-by: Jake Smith jake.smith@lexisnexisrisk.com

Type of change:

  • This change is a bug fix (non-breaking change which fixes an issue).
  • This change is a new feature (non-breaking change which adds functionality).
  • This change improves the code (refactor or other change that does not change the functionality)
  • This change fixes warnings (the fix does not alter the functionality or the generated code)
  • This change is a breaking change (fix or feature that will cause existing behavior to change).
  • This change alters the query API (existing queries will have to be recompiled)

Checklist:

  • My code follows the code style of this project.
    • My code does not create any new warnings from compiler, build system, or lint.
  • The commit message is properly formatted and free of typos.
    • The commit message title makes sense in a changelog, by itself.
    • The commit is signed.
  • My change requires a change to the documentation.
    • I have updated the documentation accordingly, or...
    • I have created a JIRA ticket to update the documentation.
    • Any new interfaces or exported functions are appropriately commented.
  • I have read the CONTRIBUTORS document.
  • The change has been fully tested:
    • I have added tests to cover my changes.
    • All new and existing tests passed.
    • I have checked that this change does not introduce memory leaks.
    • I have used Valgrind or similar tools to check for potential issues.
  • I have given due consideration to all of the following potential concerns:
    • Scalability
    • Performance
    • Security
    • Thread-safety
    • Premature optimization
    • Existing deployed queries will not be broken
    • This change fixes the problem, not just the symptom
    • The target branch of this pull request is appropriate for such a change.
  • There are no similar instances of the same problem that should be addressed
    • I have addressed them here
    • I have raised JIRA issues to address them separately
  • This is a user interface / front-end modification
    • I have tested my changes in multiple modern browsers
    • The component(s) render as expected

Testing:

@jakesmith
HPCC-20504 Add some error codes to dafilesrv reply errors
9d8d07c 
Also make JSON request response standard/differentiate with
special handling of testsocket client.

Signed-off-by: Jake Smith <jake.smith@lexisnexisrisk.com>
@hpcc-jirabot
Copy link

https://track.hpccsystems.com/browse/HPCC-20504
Jira updated

@HPCCSmoketest
Copy link
Contributor

Automated Smoketest: ✅
OS: centos 7.4.1708 (Linux 3.10.0-327.28.3.el7.x86_64)
Sha: 9d8d07c
Build: success
Install hpccsystems-platform-community_7.0.0-rc1.el7.x86_64.rpm
HPCC Start: OK

Unit tests result:

Test total passed failed errors timeout
unittest 94 94 0 0 0
wutoolTest(Dali) 19 19 0 0 0
wutoolTest(Cassandra) 19 19 0 0 0

Regression test result:

phase total pass fail
setup (hthor) 11 11 0
setup (thor) 11 11 0
setup (roxie) 11 11 0
test (hthor) 806 806 0
test (thor) 730 730 0
test (roxie) 879 879 0

HPCC Stop: OK
HPCC Uninstall: OK
Time stats:

Prep time Build time Package time Install time Start time Test time Stop time Summary
18 sec (00:00:18) 177 sec (00:02:57) 95 sec (00:01:35) 20 sec (00:00:20) 42 sec (00:00:42) 1313 sec (00:21:53) 18 sec (00:00:18) 1683 sec (00:28:03)

@jakesmith
Copy link
Member Author

Not sure this will go into 7.0.0RC2 - but it would be good if it could, mainly so Spark / @rpastrana - has error codes coming back cleanly.

@jakesmith
Copy link
Member Author

@ghalliday - Please review

ghalliday
ghalliday reviewed Sep 10, 2018
View reviewed changes
tools/testsocket/testsocket.cpp
@@ -335,7 +337,11 @@ int readResults(ISocket * socket, bool readBlocked, bool useHTTP, StringBuffer &
}
else if (remoteReadRequest)
{
Owned<IPropertyTree> requestTree = createPTreeFromJSONString(queryLen, query);
auto cmd = queryRemoteStreamCmd();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor: is auto the best type here? I can think of arguments both ways.

@ghalliday
Copy link
Member

@jakesmith the change looks fine - I assume you have tested thoroughly.

@jakesmith
Copy link
Member Author

@rpastrana has cherry-picked tested.

@ghalliday - please merge.

@ghalliday ghalliday merged commit a9ddb1f into hpcc-systems:master Sep 10, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ghalliday ghalliday ghalliday left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@jakesmith @hpcc-jirabot @HPCCSmoketest @ghalliday