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

[feat] upgrade bs image #2629

Merged
merged 2 commits into from
Aug 9, 2023

Conversation

Cyber-SiKu
Copy link
Contributor

  1. upgrade image frome debian9 to debian11
  2. build in docker
  3. ut run in docker

What problem does this PR solve?

Issue Number: #xxx

Problem Summary:

What is changed and how it works?

What's Changed:

How it Works:

Side effects(Breaking backward compatibility? Performance regression?):

Check List

  • Relevant documentation/comments is changed or added
  • I acknowledge that all my contributions will be made under the project's license

@Cyber-SiKu Cyber-SiKu changed the title [feat] upgreade image [feat] upgreade bs image Jul 17, 2023
@Cyber-SiKu Cyber-SiKu force-pushed the feat/upgreade_image_bs branch 28 times, most recently from c1e6a8d to c103007 Compare July 20, 2023 11:56
@Cyber-SiKu Cyber-SiKu mentioned this pull request Jul 25, 2023
@Cyber-SiKu Cyber-SiKu force-pushed the feat/upgreade_image_bs branch 2 times, most recently from 9c22d7b to 6e5dca1 Compare August 3, 2023 13:59
@Cyber-SiKu
Copy link
Contributor Author

cicheck

@Cyber-SiKu
Copy link
Contributor Author

Cyber-SiKu commented Aug 3, 2023

@Cyber-SiKu Cyber-SiKu changed the title [feat] upgreade bs image [feat] upgrade bs image Aug 4, 2023
@Cyber-SiKu Cyber-SiKu force-pushed the feat/upgreade_image_bs branch 4 times, most recently from d517d90 to 4a45ec5 Compare August 4, 2023 07:24
@Cyber-SiKu
Copy link
Contributor Author

cicheck

curvefs/docker/debian11/Dockerfile Show resolved Hide resolved
docker/debian11/base/Dockerfile Show resolved Hide resolved
docker/debian11/base/Dockerfile Outdated Show resolved Hide resolved
docker/debian11/compile/Dockerfile Outdated Show resolved Hide resolved
docker/debian11/compile/Dockerfile Show resolved Hide resolved
@@ -51,6 +55,22 @@ int CurveCluster::InitMdsClient(const curve::client::MetaServerOption &op) {
return mdsClient_->Initialize(op);
}

std::vector<char *> VecStr2VecChar(std::vector<std::string> args) {
Copy link
Contributor

Choose a reason for hiding this comment

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

how about concatenating them into one string?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

how about concatenating them into one string?

will run fail

util/ut_in_image.sh Show resolved Hide resolved
@@ -35,7 +35,8 @@ server.snapshotPoolThreadNum=256
# 快照后台线程扫描等待队列和工作队列的扫描周期(单位:ms)
server.snapshotTaskManagerScanIntervalMs=1000
# 转储chunk分片大小
server.chunkSplitSize=1048576
# for nos, pls set to 1048576
server.chunkSplitSize=8388608
Copy link
Contributor

Choose a reason for hiding this comment

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

@xu-chaojie pls check this, if we change the default value, we may encounter compatible problem when upgrading existing cluster.

Copy link
Member

Choose a reason for hiding this comment

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

It is no problem

@@ -57,7 +58,8 @@ server.commonPoolThreadNum=256
# CloneTaskManager 后台线程扫描间隔
server.cloneTaskManagerScanIntervalMs=1000
# clone chunk分片大小
server.cloneChunkSplitSize=65536
# for nos, pls set to 65536
server.cloneChunkSplitSize=1048576
Copy link
Contributor

Choose a reason for hiding this comment

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

ditto

@Cyber-SiKu Cyber-SiKu force-pushed the feat/upgreade_image_bs branch 4 times, most recently from 5d5543f to a2dd31b Compare August 4, 2023 09:51
@Cyber-SiKu
Copy link
Contributor Author

cicheck

RUN mkdir -p /etc/curvefs /core /etc/curve && chmod a+x /entrypoint.sh \
&& cp /curvefs/tools/sbin/curvefs_tool /usr/bin \
&& cp /curvefs/tools-v2/sbin/curve /usr/bin/
ENTRYPOINT ["/entrypoint.sh"]
Copy link
Member

Choose a reason for hiding this comment

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

this line is no need any more?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

this line is no need any more?

it will use parent image entrypoint.

@@ -117,10 +117,10 @@ void FileLockManager::LockInternal(const std::string& path,

if (lockType == kRead) {
// get read lock
entry->rwLock_.RDLock();
bthread_rwlock_rdlock(&entry->rwLock_);
Copy link
Member

Choose a reason for hiding this comment

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

why chanage this lock to bthread lock

Copy link
Contributor Author

Choose a reason for hiding this comment

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

why chanage this lock to bthread lock

The original way will have some problems in the higher version of gcc

@xu-chaojie
Copy link
Member

cherry-pick this to release1.2.7 ?

@Cyber-SiKu
Copy link
Contributor Author

cherry-pick this to release1.2.7 ?

ok

0. upgrade image frome debian9 to debian11
1. build in docker
2. ut run in docker

Signed-off-by: Cyber-SiKu <Cyber-SiKu@outlook.com>
Signed-off-by: Cyber-SiKu <Cyber-SiKu@outlook.com>
@Cyber-SiKu
Copy link
Contributor Author

cicheck

2 similar comments
@Cyber-SiKu
Copy link
Contributor Author

cicheck

@Cyber-SiKu
Copy link
Contributor Author

cicheck

@Cyber-SiKu Cyber-SiKu merged commit 05993a9 into opencurve:master Aug 9, 2023
3 checks passed
@Cyber-SiKu Cyber-SiKu deleted the feat/upgreade_image_bs branch August 9, 2023 03:01
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.

None yet

3 participants