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-22627 Add skew info to logical files when published #12856

Merged
merged 1 commit into from
Aug 8, 2019
Merged

HPCC-22627 Add skew info to logical files when published #12856

merged 1 commit into from
Aug 8, 2019

Conversation

jakesmith
Copy link
Member

@jakesmith jakesmith commented Aug 7, 2019 •
edited
Loading

Expose on file details page.

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

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-22627
Jira updated

@jakesmith
Copy link
Member Author

@wangkx - please review.

Do dfu_file.xslt (there's 2 of them) need changing as well?
I did alter them, but they seemed to make no difference to eclwatch.

wangkx
wangkx reviewed Aug 7, 2019
View reviewed changes
Copy link
Member

@wangkx wangkx left a comment

Choose a reason for hiding this comment

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

@jakesmith Please check my 2 questions.

In ws_dfuService.cpp, you may also define out the getFilePartsOnClusters() because it is not needed anymore.

The dfu_file.xslt is for legacy ECLwatch.

dali/base/dadfs.cpp
}
offset_t avgPartSz = totalPartSz / np;

maxSkew = (unsigned)(10000.0 * (((double)maxPartSz-avgPartSz)/avgPartSz));
Copy link
Member

Choose a reason for hiding this comment

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

Why do 10000.0 * here and /100 in ws_dfuService.cpp? Why not do 100* here?

Copy link
Member Author

Choose a reason for hiding this comment

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

To keep it as an unsigned with 2 point precision. When it is divided by 100 it may become e.g. 123.45%

esp/services/ws_dfu/ws_dfuService.cpp Outdated
Stat.setMaxSkewPart(maxSkewPart);
}

VStringBuffer minSkewString("-%.2f", ((double)minSkew)/100);
Copy link
Member

Choose a reason for hiding this comment

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

Should the minus be added if minSkew = 0?

Copy link
Member

Choose a reason for hiding this comment

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

@jakesmith did you miss this comment?

Copy link
Member Author

Choose a reason for hiding this comment

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

I did miss it, thanks. I agree should be removed.
I'll change.

Copy link
Member Author

Choose a reason for hiding this comment

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

@wangkx - have now amended to avoid adding minus if no skew.

@jakesmith
Copy link
Member Author

The dfu_file.xslt is for legacy ECLwatch.

@wangkx - should they be kept updated?

@jakesmith
Copy link
Member Author

In ws_dfuService.cpp, you may also define out the getFilePartsOnClusters() because it is not needed anymore.

I did not mean to leave defined out, I meant to delete, but thanks, yes I'll also delete getFilePartsOnClusters.
Can you double check nothing in the code being removed is needed?

@wangkx
Copy link
Member

wangkx commented Aug 7, 2019

If you can update the dfu_file.xslt, it will be great. We do not support the legacy ECLWatch officially. But, someone still uses it.

I haven't found any code being removed is needed.

@jakesmith
Copy link
Member Author

@wangkx - have deleted the defined out code and getFilePartsOnClusters()
After speaking to Gordon, I won't change legacy files. If people want the new stuff they shouldn't be using legacy.

Please review.

wangkx
wangkx approved these changes Aug 7, 2019
View reviewed changes
Copy link
Member

@wangkx wangkx left a comment

Choose a reason for hiding this comment

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

@jakesmith looks fine.

@jakesmith
Copy link
Member Author

@richardkchapman - please merge.

@richardkchapman
Copy link
Member

@jakesmith Should this target 7.6?

@jakesmith
HPCC-22627 Add skew info to logical files when published
e9a2e17 
Expose on file details page.

Signed-off-by: Jake Smith <jake.smith@lexisnexisrisk.com>
@jakesmith jakesmith changed the base branch from candidate-7.4.x to master August 8, 2019 08:24
@jakesmith
Copy link
Member Author

@richardkchapman - yeah think it should, have rebased

@HPCCSmoketest
Copy link
Contributor

Automated Smoketest: ✅
OS: centos 7.6.1810 (Linux 3.10.0-327.28.3.el7.x86_64)
GCC:gcc (GCC) 7.3.1 20180303 (Red Hat 7.3.1-5)
Sha: e9a2e17
Build: success
Build: success
Install HPCC Platform
HPCC Start: OK

Unit tests result:

Test total passed failed errors timeout elaps
unittest 116 116 0 0 0 40 sec
wutoolTest(Dali) 19 19 0 0 0 1 sec
wutoolTest(Cassandra) 19 19 0 0 0 8 sec

Regression test result:

phase total pass fail elaps
setup (hthor) 11 11 0 26 sec (00:00:26)
setup (thor) 11 11 0 46 sec (00:00:46)
setup (roxie) 11 11 0 18 sec (00:00:18)
test (hthor) 847 847 0 207 sec (00:03:27)
test (thor) 770 770 0 704 sec (00:11:44)
test (roxie) 923 923 0 234 sec (00:03:54)

HPCC Stop: OK
Time stats:

Prep time Build time Package time Install time Start time Test time Stop time Summary
46 sec (00:00:46) 258 sec (00:04:18) 0 sec (00:00:00) 90 sec (00:01:30) 18 sec (00:00:18) 1461 sec (00:24:21) 20 sec (00:00:20) 1893 sec (00:31:33)

@richardkchapman richardkchapman merged commit 8d66120 into hpcc-systems:master Aug 8, 2019
wangkx pushed a commit to wangkx/HPCC-Platform that referenced this pull request Nov 22, 2019
HPCC-23160 Add back DFUFileParts code to WsDFU.DFUInfo
5f130fe 
The code was removed by:
hpcc-systems#12856.
The code is needed for ECLWatch to retrieve file parts
information.

Signed-off-by: wangkx <kevin.wang@lexisnexis.com>
@wangkx wangkx mentioned this pull request Nov 22, 2019
Merged
38 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wangkx wangkx wangkx approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@jakesmith @hpcc-jirabot @wangkx @richardkchapman @HPCCSmoketest