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

[Build]: Support build on GCC 11+ #2642

Merged
merged 2 commits into from
Jul 26, 2023
Merged

[Build]: Support build on GCC 11+ #2642

merged 2 commits into from
Jul 26, 2023

Conversation

NaturalSelect
Copy link
Contributor

@NaturalSelect NaturalSelect commented Jul 22, 2023 •
edited

What problem does this PR solve?

  • Support build on GCC 11+.

What is changed and how it works?

What's Changed:

  • Add a patch to brpc.
  • Fix mismatched new[] and delete.

How it Works:

  • Add -D__const__=__unused__ to brpc CXX_FLAGS.
  • Change CopysetNode::GetAppliedIndex memory order to std::memory_order_acquire.

curve/curvefs/src/metaserver/copyset/copyset_node.h

Line 304 in c30eff0

return appliedIndex_.load(std::memory_order_acq_rel);

See also:

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

@NaturalSelect
Copy link
Contributor Author

NaturalSelect commented Jul 22, 2023 •
edited

curvefs:

==================== [ BUILD SUMMARY ] ====================
[✔] //curvefs/test/volume:volume_unittest 
[✔] //curvefs/test/tools:curvefs_version_tool_test 
[✔] //curvefs/test/tools:curvefs_umount_tool_test 
[✔] //curvefs/test/tools:curvefs_tool_factory_test 
[✔] //curvefs/test/tools:curvefs_space_status_tool_test 
[✔] //curvefs/test/tools:curvefs_space_base_tool_test 
[✔] //curvefs/test/tools:curvefs_create_topology_tool_test 
[✔] //curvefs/test/metaserver/storage:storage_test 
[✔] //curvefs/test/metaserver/space:space_test 
[✔] //curvefs/test/metaserver/s3compact:s3compact_test 
[✔] //curvefs/test/metaserver/copyset:metaserver_copyset_test 
[✔] //curvefs/test/metaserver/copyset:metaserver_copyset_cli_service2_test 
[✔] //curvefs/test/metaserver:metaserver_s3_adaptor_test 
[✔] //curvefs/test/metaserver:curvefs_recycle_test 
[✔] //curvefs/test/metaserver:curvefs_partition_clean_test 
[✔] //curvefs/test/metaserver:curvefs_metaserver_test 
[✔] //curvefs/test/metaserver:curvefs_metaserver_metastore_test 
[✔] //curvefs/test/mds/topology:curvefs_topology_utest 
[✔] //curvefs/test/mds/space:curvefs_mds_space_unittest 
[✔] //curvefs/test/mds/schedule/scheduleService:schedule_service_test 
[✔] //curvefs/test/mds/schedule:curvefs_schedule_test 
[✔] //curvefs/test/mds/heartbeat:curvefs-heartbeat-test 
[✔] //curvefs/test/mds/codec:fs_mds_codec_test 
[✔] //curvefs/test/mds:curvefs_metaserver_balance_poc_test 
[✔] //curvefs/test/mds:curvefs_mds_test 
[✔] //curvefs/test/mds:curvefs_chunkid_allocator_test 
[✔] //curvefs/test/common:curvefs-common-test 
[✔] //curvefs/test/client/volume:curvefs_client_volume_test 
[✔] //curvefs/test/client/rpcclient:rpcclient_test 
[✔] //curvefs/test/client/metric:client_metric_test 
[✔] //curvefs/test/client/lease:lease_test 
[✔] //curvefs/test/client/filesystem:curvefs_client_filesystem_test 
[✔] //curvefs/test/client/common:curvefs_client_common_test 
[✔] //curvefs/test/client:curvefs_client_memcache_test 
[✔] //curvefs/test/client:curve_fuse_test 
[✔] //curvefs/test/client:client_s3_test 
[✔] //curvefs/src/tools:curvefs_tool 
[✔] //curvefs/src/metaserver:curvefs-metaserver 
[✔] //curvefs/src/mds:curvefs-mds 
[✔] //curvefs/src/client:curve-fuse

@NaturalSelect NaturalSelect marked this pull request as ready for review July 22, 2023 08:07
@NaturalSelect NaturalSelect marked this pull request as draft July 22, 2023 08:15
@NaturalSelect
Copy link
Contributor Author

NaturalSelect commented Jul 22, 2023 •
edited

curvebs:

==================== [ BUILD SUMMARY ] ====================
[✔] //tools:curvefsTool 
[✔] //test/tools:curve_tool_test 
[✔] //test/snapshotcloneserver:snapshot_server_utest 
[✔] //test/mds/topology:topology_utest 
[✔] //test/mds/snapshotcloneclient:snapshotcloneclient_utest 
[✔] //test/mds/server:mds-test 
[✔] //test/mds/schedule/schedulerPOC:scheduler_poc 
[✔] //test/mds/schedule/scheduleService:schedule_service_test 
[✔] //test/mds/schedule:schedule-test 
[✔] //test/mds/nameserver2/idgenerator:id_generator_test 
[✔] //test/mds/nameserver2/helper:helper_test 
[✔] //test/mds/nameserver2/allocstatistic:alloc_statistic_test 
[✔] //test/mds/nameserver2:curvefs_test 
[✔] //test/mds/heartbeat:heartbeat-test 
[✔] //test/mds/copyset:copyset_utest 
[✔] //test/mds/chunkserverclient:chunkserverclient_utest 
[✔] //test/leaderelection:leader_election_test 
[✔] //test/kvstorageclient:kvstorage_client_test 
[✔] //test/integration/snapshotcloneserver:snapshot_server_recover_itest 
[✔] //test/integration/snapshotcloneserver:snapshot_server_main_test 
[✔] //test/integration/snapshotcloneserver:snapshot_server_exception_itest 
[✔] //test/integration/snapshotcloneserver:snapshot_server_concurrent_itest 
[✔] //test/integration/snapshotcloneserver:snapshot_server_common_itest 
[✔] //test/integration/raft:raft-vote-test 
[✔] //test/integration/raft:raft-snapshot-test 
[✔] //test/integration/raft:raft-log-replication-test 
[✔] //test/integration/raft:raft-config-change-test 
[✔] //test/integration/heartbeat:mds_heartbeat_exception_integration 
[✔] //test/integration/heartbeat:mds_heartbeat_basic_integration 
[✔] //test/integration/cluster_common:cluster_basic_test 
[✔] //test/integration/client:client_integration_test_unstable_chunkserver 
[✔] //test/integration/client:client_integration_test_mds 
[✔] //test/integration/client:client_integration_test_chunkserver 
[✔] //test/integration/chunkserver/datastore:datastore_stress_test 
[✔] //test/integration/chunkserver/datastore:datastore_snapshot_case_test 
[✔] //test/integration/chunkserver/datastore:datastore_restart_test 
[✔] //test/integration/chunkserver/datastore:datastore_exception_test 
[✔] //test/integration/chunkserver/datastore:datastore_concurrency_test 
[✔] //test/integration/chunkserver/datastore:datastore_clone_case_test 
[✔] //test/integration/chunkserver/datastore:datastore_basic_test 
[✔] //test/integration/chunkserver:chunkserver-concurrent-test 
[✔] //test/integration/chunkserver:chunkserver-clone-recover-test 
[✔] //test/integration/chunkserver:chunkserver-basic-test 
[✔] //test/idgenerator:etcd_id_generator_test 
[✔] //test/fs:lfs_unittest 
[✔] //test/failpoint:failpoint_test 
[✔] //test/common:common-test 
[✔] //test/client:libcurve_client_unittest 
[✔] //test/client:client_test_unittest 
[✔] //test/client:client_snapshot_test_unittest 
[✔] //test/client:client_session_unittest 
[✔] //test/client:client_request_sender_test 
[✔] //test/client:client_metric_test 
[✔] //test/client:client_mdsclient_metacache_unittest 
[✔] //test/client:client_mds_failover_test 
[✔] //test/client:client_mds_client_test 
[✔] //test/client:client_libcbd_unittest 
[✔] //test/client:client_lease_executor_test 
[✔] //test/client:client_inflightrpc_test 
[✔] //test/chunkserver/raftsnapshot:curve-raftsnapshot-unittest 
[✔] //test/chunkserver/raftlog:curve-raftlog-unittest 
[✔] //test/chunkserver/datastore:curve_datastore_unittest 
[✔] //test/chunkserver/concurrent_apply:concurrent_apply_test 
[✔] //test/chunkserver/clone:clone_test 
[✔] //test/chunkserver:server-test 
[✔] //test/chunkserver:scan-manager-test 
[✔] //test/chunkserver:multi-copyset-io-test 
[✔] //test/chunkserver:metric_test 
[✔] //test/chunkserver:heartbeat_test 
[✔] //test/chunkserver:heartbeat_helper_test 
[✔] //test/chunkserver:copyset-node-manager-test 
[✔] //test/chunkserver:copyset-epoch-test 
[✔] //test/chunkserver:client-test 
[✔] //test/chunkserver:cli2-test 
[✔] //test/chunkserver:cli-test 
[✔] //test/chunkserver:chunkserver_test 
[✔] //test/chunkserver:chunkserver_service_test 
[✔] //test/chunkserver:chunk-test1 
[✔] //test/chunkserver:chunk-snapshot-test 
[✔] //test/chunkserver:chunk-service-test2 
[✔] //test/chunkserver:chunk-service-test 
[✔] //test/chunkserver:braftcliservice2-test 
[✔] //test/chunkserver:braftcliservice-test 
[✔] //src/tools:curve_tool 
[✔] //src/tools:curve_format 
[✔] //src/tools:curve_chunkserver_tool 
[✔] //src/snapshotcloneserver:snapshotcloneserver 
[✔] //src/mds/main:curvemds 
[✔] //src/chunkserver:chunkserver 
[✔] //nebd/test/part2:test_request_executor_curve 
[✔] //nebd/test/part2:test_nebd_server 
[✔] //nebd/test/part2:metafile_manager_test 
[✔] //nebd/test/part2:heartbeat_service_test 
[✔] //nebd/test/part2:heartbeat_manager_test 
[✔] //nebd/test/part2:fileservice_test 
[✔] //nebd/test/part2:filemanager_test 
[✔] //nebd/test/part1:nebd_metacache_unittest 
[✔] //nebd/test/part1:nebd_lib_unittest 
[✔] //nebd/test/part1:nebd_client_unittest 
[✔] //nebd/test/part1:heartbeat_manager_unittest 
[✔] //nebd/test/common:nebd_common_unittest 
[✔] //nebd/src/part2:nebd-server 
[✔] //nbd/test:nbd_test 
[✔] //nbd/src:curve-nbd

@NaturalSelect NaturalSelect marked this pull request as ready for review July 22, 2023 09:54
@NaturalSelect NaturalSelect changed the title [Build]: Support build on gcc11+ [Build]: Support build on GCC 11+ Jul 22, 2023
wu-hanqing
wu-hanqing reviewed Jul 22, 2023
View reviewed changes
Copy link
Contributor

@wu-hanqing wu-hanqing left a comment

Choose a reason for hiding this comment

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

BTW, please follow guidelines, and start CI check

nebd/test/part1/fake_file_service.cpp Outdated Show resolved Hide resolved
thirdparties/brpc/fix-gcc11.patch Show resolved Hide resolved
@NaturalSelect
fix(build): add a patch to support build on GCC 11+
72f7cb6 
Signed-off-by: NaturalSelect <2145973003@qq.com>

The solution is from apache/brpc#1784 and apache/brpc#1783, and the 2
pull requests were merged into brpc master. So we can remove the patch
when our brpc up-to-date.
@NaturalSelect
fix: fix mismatched new[] and delete
793ca4e 
Signed-off-by: NaturalSelect <2145973003@qq.com>
@wu-hanqing
Copy link
Contributor

cicheck

@Cyber-SiKu Cyber-SiKu self-requested a review July 26, 2023 02:14
@wu-hanqing wu-hanqing merged commit 76bfade into opencurve:master Jul 26, 2023
3 checks passed
@NaturalSelect NaturalSelect deleted the master branch August 16, 2023 12:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wu-hanqing wu-hanqing wu-hanqing approved these changes

@Cyber-SiKu Cyber-SiKu Cyber-SiKu 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.

None yet
3 participants
@NaturalSelect @wu-hanqing @Cyber-SiKu