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-18391 Copy env xml and conf files only if they don't exist #10813

Merged

Conversation

Projects
None yet
5 participants
@Michael-Gardner
Copy link
Contributor

commented Jan 25, 2018

Signed-off-by: Michael Gardner michael.gardner@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:

@hpcc-jirabot

This comment has been minimized.

Copy link

commented Jan 25, 2018

@Michael-Gardner

This comment has been minimized.

Copy link
Contributor Author

commented Jan 25, 2018

@mayx Please review

@mayx

This comment has been minimized.

Copy link
Member

commented Jan 25, 2018

@Michael-Gardner Your change does the check during generation of the install make files. I think it should be checked inside the install make files. The situation could well change between make file generation and install.

@mayx
Copy link
Member

left a comment

I think the check should be done at install time, instead of make file generation time.

@richardkchapman richardkchapman changed the base branch from candidate-6.4.10 to candidate-6.4.12 Feb 8, 2018

Michael Gardner
HPCC-18391 Copy env xml and conf files only if they don't exist
Signed-off-by: Michael Gardner <michael.gardner@lexisnexisrisk.com>

@Michael-Gardner Michael-Gardner force-pushed the Michael-Gardner:HPCC-18391 branch 2 times, most recently from 9cb5bc2 to 9de9ed6 Feb 8, 2018

Michael Gardner
HPCC-18391 Move filecheck from generation to before copy
Signed-off-by: Michael Gardner <michael.gardner@lexisnexisrisk.com>

@Michael-Gardner Michael-Gardner force-pushed the Michael-Gardner:HPCC-18391 branch from 9de9ed6 to be538a3 Feb 8, 2018

@Michael-Gardner

This comment has been minimized.

Copy link
Contributor Author

commented Feb 8, 2018

@mayx I've changed it to be done at installation time.

@HPCCSmoketest

This comment has been minimized.

Copy link
Contributor

commented Feb 8, 2018

Automated Smoketest:
Sha: be538a3
Build: success
Install hpccsystems-platform-community_6.4.12-closedown0.el7.x86_64.rpm
HPCC Start: OK

Unit tests result:

Test total passed failed errors timeout
unittest 97 97 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) 734 734 0
test (thor) 628 628 0
test (roxie) 761 761 0

HPCC Stop: OK
HPCC Uninstall: OK
Time stats:

Prep time Build time Package time Install time Start time Test time Stop time Summary
17 sec (00:00:17) 159 sec (00:02:39) 37 sec (00:00:37) 6 sec (00:00:06) 34 sec (00:00:34) 1079 sec (00:17:59) 34 sec (00:00:34) 1366 sec (00:22:46)
@mayx

mayx approved these changes Feb 14, 2018

Copy link
Member

left a comment

@Michael-Gardner looks good.

@richardkchapman richardkchapman merged commit 0366d28 into hpcc-systems:candidate-6.4.12 Feb 14, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.