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

Jump to bottom

HPCC-23717 Change dali to use new config #13502

Merged
merged 1 commit into from Mar 18, 2020
Merged

HPCC-23717 Change dali to use new config #13502

merged 1 commit into from Mar 18, 2020

Conversation

jakesmith
Copy link
Member

@jakesmith jakesmith commented Mar 13, 2020 •
edited

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
    • Cloud-compatibility
    • 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

Smoketest:

  • Send notifications about my Pull Request position in Smoketest queue.
  • Test my draft Pull Request.

Testing:

@hpcc-jirabot
Copy link

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

jakesmith
jakesmith commented Mar 13, 2020
View reviewed changes
system/jlib/jptree.cpp
while (held)
Sleep(5);
}
#endif
Copy link
Member Author

Choose a reason for hiding this comment

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

@richardkchapman - moved here so I could use via values.yaml - any objections?

Copy link
Member

Choose a reason for hiding this comment

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

It's already supported in jptree via values.yaml - see line 7881 or so.

Copy link
Member

Choose a reason for hiding this comment

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

Ah - never mind I see what you did. The only downside of moving it here is that it will make it harder to debug a situation where it's crashing in config merging code.

You could always leave it in both places...

Copy link
Member Author

Choose a reason for hiding this comment

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

The only downside of moving it here is that it will make it harder to debug a situation where it's crashing in config merging code.

true, yes in _DEBUG why not. I'll change.

jakesmith
jakesmith commented Mar 13, 2020
View reviewed changes
dali/server/daserver.cpp
StringBuffer s("Failure whilst preparing dali backup location: ");
LOG(MCoperatorError, unknownJob, e, s.append(mirrorPath).append(". Backup disabled").str());
serverConfig->removeProp("SDS/@remoteBackupLocation");
e->Release();
Copy link
Member Author

Choose a reason for hiding this comment

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

Much of the above is different because indentation/scope change only.

@jakesmith
Copy link
Member Author

@richardkchapman - please review

@richardkchapman
Copy link
Member

@jakesmith This is waiting for a change you promised...

@jakesmith
Copy link
Member Author

@richardkchapman - changed --hold so picked up in either place.

@HPCCSmoketest
Copy link
Contributor

Automated Smoketest: ❌
OS: centos 7.6.1810 (Linux 3.10.0-957.1.3.el7.x86_64)
GCC: gcc (GCC) 7.3.1 20180303 (Red Hat 7.3.1-5)
Host: ip-10-20-0-131.ca-central-1.compute.internal
Sha: eaeb4ac
Number of Error(s): 6
/home/centos/smoketest/PR-13502/HPCC-Platform/system/jlib/jptree.cpp:7873:22: error: unused variable \xe2\x80\x98matchHold\xe2\x80\x99 [-Werror=unused-variable]
/home/centos/smoketest/PR-13502/HPCC-Platform/system/jlib/jptree.cpp:7840:13: error: \xe2\x80\x98void holdLoop()\xe2\x80\x99 defined but not used [-Werror=unused-function]
cc1plus: all warnings being treated as errors
make[2]: *** [system/jlib/CMakeFiles/jlib.dir/build.make:427: system/jlib/CMakeFiles/jlib.dir/jptree.cpp.o] Error 1
make[1]: *** [CMakeFiles/Makefile2:1266: system/jlib/CMakeFiles/jlib.dir/all] Error 2
make: *** [Makefile:163: all] Error 2

Build error:
Build log Build log

@jakesmith
HPCC-23717 Change dali to use new config
a52bd9f 
Signed-off-by: Jake Smith <jake.smith@lexisnexisrisk.com>
@HPCCSmoketest
Copy link
Contributor

Automated Smoketest: ✅
OS: centos 7.7.1908 (Linux 3.10.0-957.1.3.el7.x86_64)
GCC: gcc (GCC) 7.3.1 20180303 (Red Hat 7.3.1-5)
Host: ip-10-20-0-116.ca-central-1.compute.internal
Sha: a52bd9f
Build: success
Milestone:Install hpccsystems-platform-community_7.7.0-trunk0.el7.x86_64.rpm
HPCC Start: OK

Unit tests result:

Test total passed failed errors timeout elaps
unittest 118 118 0 0 0 54 sec
wutoolTest(Dali) 19 19 0 0 0 2 sec
wutoolTest(Cassandra) 19 19 0 0 0 8 sec

Regression test result:

phase total pass fail elaps
setup (hthor) 11 11 0 27 sec (00:00:27)
setup (thor) 11 11 0 46 sec (00:00:46)
setup (roxie) 11 11 0 19 sec (00:00:19)
test (hthor) 873 873 0 583 sec (00:09:43)
test (thor) 812 812 0 976 sec (00:16:16)
test (roxie) 953 953 0 707 sec (00:11:47)

HPCC Stop: OK
HPCC Uninstall: OK
Time stats:

Prep time Build time Package time Install time Start time Test time Stop time Summary
16 sec (00:00:16) 827 sec (00:13:47) 124 sec (00:02:04) 23 sec (00:00:23) 17 sec (00:00:17) 2597 sec (00:43:17) 17 sec (00:00:17) 3621 sec (01:00:21)

@richardkchapman richardkchapman merged commit f4b8b7d into hpcc-systems:master Mar 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@richardkchapman richardkchapman richardkchapman left review comments

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