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

fix: pack without libaio #676

Merged
merged 21 commits into from
Feb 25, 2021
Merged

fix: pack without libaio #676

merged 21 commits into from
Feb 25, 2021

Conversation

neverchanje
Copy link
Contributor

@neverchanje neverchanje commented Jan 8, 2021

What problem does this PR solve?

Because we removed the dependency of libaio in the latest version, the binary is not linked with libaio anymore.

'./src/server/config.ini' -> 'pegasus-server-2.1.SNAPSHOT-33ef638-glibc2.27-release/bin/config.ini'
'/usr/lib/x86_64-linux-gnu/libstdc++.so.6' -> 'pegasus-server-2.1.SNAPSHOT-33ef638-glibc2.27-release/bin/libstdc++.so.6'
'/usr/lib/x86_64-linux-gnu/libsnappy.so.1' -> 'pegasus-server-2.1.SNAPSHOT-33ef638-glibc2.27-release/bin/libsnappy.so.1'
'/usr/lib/x86_64-linux-gnu/libcrypto.so.1.1' -> 'pegasus-server-2.1.SNAPSHOT-33ef638-glibc2.27-release/bin/libcrypto.so.1.1'
'/usr/lib/x86_64-linux-gnu/libssl.so.1.1' -> 'pegasus-server-2.1.SNAPSHOT-33ef638-glibc2.27-release/bin/libssl.so.1.1'
ERROR: invalid copy file command: cp pegasus-server-2.1.SNAPSHOT-33ef638-glibc2.27-release/bin/
Error: Process completed with exit code 1

It causes pegasus unable to package while running ./run.sh pack_server.

What is changed and how it works?

I refactored the packaging script and let it pack without libaio.

Check List

Tests

  • Manual test (add detailed scripts or steps below)
./run.sh pack_server

Good pass

./run.sh pack_tools

Good pass

@neverchanje neverchanje changed the title Pack fix: pack without libaio Jan 8, 2021
levy5307
levy5307 previously approved these changes Jan 8, 2021
levy5307
levy5307 previously approved these changes Jan 11, 2021
hycdong
hycdong previously approved these changes Jan 26, 2021
levy5307
levy5307 previously approved these changes Feb 2, 2021
@neverchanje neverchanje dismissed stale reviews from levy5307 and hycdong via 92143ac February 9, 2021 09:49
Copy link
Contributor

@zhangyifan27 zhangyifan27 left a comment

Choose a reason for hiding this comment

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

Since this pr contains different fixes, it’s better to mention it in the title or commit message.

exit 1
fi
SYS_LIB_NAME=$(get_system_libname server "$1")
copy_file "${SYS_LIB_PATH}" "${pack}/bin/${SYS_LIB_NAME}"
Copy link
Contributor

Choose a reason for hiding this comment

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

why not copy_file "${SYS_LIB_PATH}" "${pack}/bin"?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm not 100% sure but ${SYS_LIB_NAME} and ${SYS_LIB_PATH} could point to different file names.

copy_file `get_system_lib shell zstd` ${pack}/DSN_ROOT/lib/`get_system_libname shell zstd`
copy_file `get_system_lib shell lz4` ${pack}/DSN_ROOT/lib/`get_system_libname shell lz4`

pack_system_lib() {
Copy link
Contributor

Choose a reason for hiding this comment

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

It's better to move pack_system_lib() to pack_common.sh .

Copy link
Contributor

@zhangyifan27 zhangyifan27 left a comment

Choose a reason for hiding this comment

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

LGTM.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants