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-31122 Remove ZAP 'Log Access plug-in' warning for bare-metal #18217

Merged
merged 1 commit into from
Jan 19, 2024
Merged

HPCC-31122 Remove ZAP 'Log Access plug-in' warning for bare-metal #18217

merged 1 commit into from
Jan 19, 2024

Conversation

wangkx
Copy link
Member

@wangkx wangkx commented Jan 12, 2024

When creating a ZAP report, if Remote Log Access plug-in is not available, ECLWatch shows a warning: "Warning: may not be able to include log file because Remote Log Access plug-in is not available!". Before this PR, the warning shows for both cloud and bare-metal. In this PR, the warning is removed for bare-metal since the Remote Log Access interface is not used in bare-metal at the moment.

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:

@github-actions GitHub Actions
Copy link

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

@wangkx wangkx requested a review from jakesmith January 12, 2024 15:20
jakesmith
jakesmith reviewed Jan 15, 2024
View reviewed changes
Copy link
Member

@jakesmith jakesmith left a comment

Choose a reason for hiding this comment

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

@wangkx - ping me on Teams to discuss.

esp/services/ws_workunits/ws_workunitsService.cpp Outdated
@@ -4979,7 +4979,7 @@ bool CWsWorkunitsEx::onWUGetZAPInfo(IEspContext &context, IEspWUGetZAPInfoReques
ipaddr.getHostText(EspIP);
resp.setESPIPAddress(EspIP.str());
}
if ((version >= 1.96) && !queryRemoteLogAccessor())
if ((version >= 1.96) && isContainerized() & !queryRemoteLogAccessor())
resp.setMessage("Warning: may not be able to include log file because Remote Log Access plug-in is not available!");
Copy link
Member

@jakesmith jakesmith Jan 15, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I'm not sure why the wording is "may" ?
If containzerized and there is no log accessor implementation available, then it will not be able to collect logging.
Also, shouldn't some of the code below this be in the else of this test, i.e. it appears to still try to get log filenames even though it has established there will be no logging available?

let's chat in Teams to clarify what onWUGetZAPInfo is doing in containerized mode.

@wangkx wangkx requested a review from jakesmith January 17, 2024 18:22
jakesmith
jakesmith approved these changes Jan 18, 2024
View reviewed changes
Copy link
Member

@jakesmith jakesmith left a comment

Choose a reason for hiding this comment

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

@wangkx - looks fine. Please squash.

HPCC-31122 Remove ZAP 'Log Access plug-in' warning for bare-metal
8b62a8c 
When creating a ZAP report, if Remote Log Access plug-in is not
available, ECLWatch shows a warning: "Warning: may not be able to
include log file because Remote Log Access plug-in is not available!".
Before this PR, the warning shows for both cloud and bare-metal. In
this PR, the warning is removed for bare-metal since the Remote Log
Access interface is not used in bare-metal at the moment.

Revise based on review:
1. Revise the warning message.
2. If Containerized, skip the code to report thor processes.
3. Add comments about reporting thor processes for bare-metal.

Signed-off-by: wangkx <[email protected]>
@wangkx
Copy link
Member Author

wangkx commented Jan 18, 2024

The PR squashed.
@ghalliday please merge.

@ghalliday ghalliday merged commit cc88ce3 into hpcc-systems:candidate-9.4.x Jan 19, 2024
45 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jakesmith jakesmith jakesmith 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.
3 participants
@wangkx @jakesmith @ghalliday