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

[Tool] dockerfile enhancement #30736

Merged
merged 1 commit into from
Sep 12, 2023
Merged

Conversation

kevincai
Copy link
Contributor

@kevincai kevincai commented Sep 11, 2023

  • remove unused fe.conf be.conf from allin1 docker image /data/deploy/ directory (Fixes [allin1] remove be.conf/fe.conf from /data/deploy #30523)
  • tail be/cn out and info log file if not running with LOG_CONSOLE=1 in case of expect shutdown, give chances of last words to console for debugging

Fixes #issue

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function

Bugfix cherry-pick branch check:

  • I have checked the version labels which the pr will be auto-backported to the target branch
    • 3.2
    • 3.1
    • 3.0
    • 2.5
    • 2.4

* remove unused fe.conf be.conf from allin1 docker image /data/deploy/
  directory (Fixes StarRocks#30523)
* tail be/cn out and info log file if not running with LOG_CONSOLE=1 in
  case of expect shutdown, give chances of last words to console for
  debugging

Signed-off-by: Kevin Xiaohua Cai <caixiaohua@starrocks.com>
@kevincai kevincai marked this pull request as ready for review September 11, 2023 09:55
@wanpengfei-git
Copy link
Collaborator

[FE Incremental Coverage Report]

😍 pass : 0 / 0 (0%)

@wanpengfei-git
Copy link
Collaborator

[BE Incremental Coverage Report]

😍 pass : 0 / 0 (0%)

@sduzh sduzh merged commit 20b4833 into StarRocks:main Sep 12, 2023
@kevincai
Copy link
Contributor Author

@Mergifyio backport branch-3.2 branch-3.1 branch-3.0 branch-2.5

@mergify
Copy link
Contributor

mergify bot commented Sep 12, 2023

backport branch-3.2 branch-3.1 branch-3.0 branch-2.5

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Sep 12, 2023
Signed-off-by: Kevin Xiaohua Cai <caixiaohua@starrocks.com>
(cherry picked from commit 20b4833)
mergify bot pushed a commit that referenced this pull request Sep 12, 2023
Signed-off-by: Kevin Xiaohua Cai <caixiaohua@starrocks.com>
(cherry picked from commit 20b4833)
mergify bot pushed a commit that referenced this pull request Sep 12, 2023
Signed-off-by: Kevin Xiaohua Cai <caixiaohua@starrocks.com>
(cherry picked from commit 20b4833)
mergify bot pushed a commit that referenced this pull request Sep 12, 2023
Signed-off-by: Kevin Xiaohua Cai <caixiaohua@starrocks.com>
(cherry picked from commit 20b4833)
if [[ $ret -ne 0 && "x$LOG_CONSOLE" != "x1" ]] ; then
nol=50
log_stderr "Last $nol lines of be.INFO ..."
tail -n 50 $STARROCKS_HOME/log/be.INFO
Copy link
Contributor

Choose a reason for hiding this comment

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

tail -n $nol $STARROCKS_HOME/log/be.INFO

log_stderr "Last $nol lines of be.INFO ..."
tail -n 50 $STARROCKS_HOME/log/be.INFO
log_stderr "Last $nol lines of be.out ..."
tail -n 50 $STARROCKS_HOME/log/be.out
Copy link
Contributor

Choose a reason for hiding this comment

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

tail -n $nol $STARROCKS_HOME/log/be.out

Copy link
Contributor Author

Choose a reason for hiding this comment

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

good point

log_stderr "Last $nol lines of cn.INFO ..."
tail -n $nol $STARROCKS_HOME/log/cn.INFO
log_stderr "Last $nol lines of cn.out ..."
tail -n $nol $STARROCKS_HOME/log/cn.out
Copy link
Contributor

Choose a reason for hiding this comment

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

I checked a k8s env, and there is no $STARROCKS_HOME environment.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

it is set in entrypoint

wyb pushed a commit that referenced this pull request Sep 13, 2023
Co-authored-by: Kevin Cai <caixiaohua@starrocks.com>
wyb pushed a commit that referenced this pull request Sep 13, 2023
Co-authored-by: Kevin Cai <caixiaohua@starrocks.com>
wyb pushed a commit that referenced this pull request Sep 13, 2023
Co-authored-by: Kevin Cai <caixiaohua@starrocks.com>
wyb pushed a commit that referenced this pull request Sep 13, 2023
Co-authored-by: Kevin Cai <caixiaohua@starrocks.com>
@kevincai kevincai deleted the enhance-dockerfile branch September 14, 2023 05:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[allin1] remove be.conf/fe.conf from /data/deploy
5 participants