[skipci]Merge block storage and file storage compilation scripts #2089
Conversation
linshiyx
changed the title
linshiyx
force-pushed
the
merge_compilation_scripts
branch
from
8defa66
to
a76c257
Compare
|
Please synthesize a commit for submission. |
linshiyx
force-pushed
the
merge_compilation_scripts
branch
from
a76c257
to
c67fcde
Compare
util/build.sh
Outdated
| get_version | ||
|
|
||
| if [[ "$g_stor" != "bs" && "$g_stor" != "fs" ]]; then | ||
| die "--stor must be either bs or fs\n" |
There was a problem hiding this comment.
stor=bs or stor=fs must be specify. --stor will fail.
There was a problem hiding this comment.
This error message instructs how to use build.sh, as the usage message does. Maybe I can update the script to print usage message when stor is not properly specified.
There was a problem hiding this comment.
Maybe I can update the script to print usage message when stor is not properly specified.
good idea.
| # 2) copy binary to project directory | ||
| # 3) generate servicectl script into project directory. | ||
| create_project_dir $project_prefix | ||
| copy_file "$binary" "$project_prefix/sbin" |
There was a problem hiding this comment.
If copying the file fails, for example the file does not exist, it is recomend to print an error and exit directly without continuing to execute.
There was a problem hiding this comment.
This feature is already included in create_project_dir.
There was a problem hiding this comment.
It may be that I did not express clearly, here is the copy may also fail.
For example, if the user compiles and specifies only, some packages may not be compiled, and $dst/XX in copy_file may not exist.
| @@ -226,6 +286,11 @@ install_etcd() { | |||
| create_project_dir $project_prefix | |||
| copy_file "$dst/etcd" "$project_prefix/sbin" | |||
| copy_file "$dst/etcdctl" "$project_prefix/sbin" | |||
| gen_servicectl \ | |||
There was a problem hiding this comment.
ditto. Each install_xx judges whether the execution is successful, and terminates the script if it fails.
There was a problem hiding this comment.
This feature is already included in gen_servicectl.
|
Thank for you contribute @linshiyx . I played around with the new build script and it's pretty good overall. And some small improvements can make this feature become better :) |
linshiyx
force-pushed
the
merge_compilation_scripts
branch
from
c67fcde
to
8399456
Compare
| @@ -1,6 +1,7 @@ | |||
| #!/usr/bin/env bash | |||
|
|
|||
| # tmpl.sh = /usr/local/metaserver.conf /tmp/metaserver.conf | |||
| # $1: bs/fs $2: tag $3: os | |||
| function tmpl() { | |||
There was a problem hiding this comment.
add set -e to terminate any command execution error.
There was a problem hiding this comment.
Yeah that's an easier way. But I missed it and have done it referring to utils/build.sh 😅
Signed-off-by: linshiyx <linshiyx5@163.com>
linshiyx
force-pushed
the
merge_compilation_scripts
branch
from
8399456
to
f390bac
Compare
|
LGTM |
What problem does this PR solve?
Issue Number: #2026
Problem Summary:
What is changed and how it works?
What's Changed:
Compile curvebs: cd curve && make build stor=bs dep=1
Compile curvefs: cd curve && make build stor=fs dep=1
How it Works:
Combine compilation scripts of curvebs with curvefs
Side effects(Breaking backward compatibility? Performance regression?):
None
Check List