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-21267 Possible issue in Dali regarding timestamp comparison #12049

Merged

Conversation

RussWhitehead
Copy link
Member

@RussWhitehead RussWhitehead commented Jan 10, 2019

When Dali checks the request timestamp to see if it is expired or from the
future, it should ignore nanoseconds in order to eliminate occasional
unexpected failures. Also, in the case of a failure, add logging of the given
request time stamp and the actual Dali time stamp, both in UTC, which should
help debug failures.

Signed-off-by: Russ Whitehead william.whitehead@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:

When Dali checks the request timestamp to see if it is expired or from the
future, it should ignore nanoseconds in order to eliminate occasional
unexpected failures. Also, in the case of a failure, add logging of the given
request time stamp and the actual Dali time stamp, both in UTC, which should
help debug failures.

Signed-off-by: Russ Whitehead <william.whitehead@lexisnexisrisk.com>
@hpcc-jirabot
Copy link

@RussWhitehead
Copy link
Member Author

@rpastrana Please review

@HPCCSmoketest
Copy link
Contributor

Automated Smoketest: ✅
OS: centos 7.4.1708 (Linux 3.10.0-327.28.3.el7.x86_64)
Sha: a1cb8ce
Build: success
Build: success
HPCC Start: OK

Unit tests result:

Test total passed failed errors timeout
unittest 95 95 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) 808 808 0
test (thor) 732 732 0
test (roxie) 882 882 0

HPCC Stop: OK
Time stats:

Prep time Build time Package time Install time Start time Test time Stop time Summary
23 sec (00:00:23) 188 sec (00:03:08) 0 sec (00:00:00) 2 sec (00:00:02) 17 sec (00:00:17) 1480 sec (00:24:40) 20 sec (00:00:20) 1730 sec (00:28:50)

Copy link
Member

@rpastrana rpastrana left a comment

Choose a reason for hiding this comment

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

@RussWhitehead looks reasonable, just a couple of questions.

@@ -164,19 +164,23 @@ class CDaliLdapConnection: implements IDaliLdapConnection, public CInterface

CDateTime now;
now.setNow();
if (now.compare(reqUTCTimestamp) < 0)//timestamp from the future?
if (now.compare(reqUTCTimestamp, false) < 0)//timestamp from the future?
Copy link
Member

Choose a reason for hiding this comment

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

How do we ensure the req timestamp is in UTC?

Copy link
Member Author

Choose a reason for hiding this comment

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

it is set by the caller (runtime engine), in dasess.cpp method createDaliSignature, which does this
StringBuffer timeStr;
now.setNow();
now.getString(timeStr, false);//get UTC timestamp

dali/server/daldap.cpp Show resolved Hide resolved
@RussWhitehead
Copy link
Member Author

@richardkchapman Please merge

@richardkchapman
Copy link
Member

@rpastrana Is this approved now?

Copy link
Member

@rpastrana rpastrana left a comment

Choose a reason for hiding this comment

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

@RussWhitehead approved

@RussWhitehead
Copy link
Member Author

@richardkchapman Please merge

@RussWhitehead
Copy link
Member Author

@richardkchapman The Vault team is asking for this. If there is another 7.0.6 release coming out let me know and I can rebase

@richardkchapman richardkchapman merged commit 1a0cd2c into hpcc-systems:candidate-7.0.8 Jan 15, 2019
@RussWhitehead RussWhitehead deleted the doUTC708 branch January 17, 2019 19:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
5 participants