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

rocksdb: sync with upstream #14818

Merged
merged 2 commits into from Apr 28, 2017

Conversation

Projects
None yet
5 participants
@tchaikov
Contributor

tchaikov commented Apr 27, 2017

to avoid warning with glibc 2.25, see
facebook/rocksdb#2208 and
ceph/rocksdb#17

Signed-off-by: Kefu Chai kchai@redhat.com

@tchaikov tchaikov requested review from badone and smithfarm Apr 27, 2017

@badone

badone approved these changes Apr 27, 2017

LGTM as long as testing passes

@tchaikov

This comment has been minimized.

Contributor

tchaikov commented Apr 27, 2017

Agent went offline during the build

retest this please.

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Apr 27, 2017

@tchaikov This fixes one build error, and causes another one (in ppc64le):

[  370s] c++: error: unrecognized command line option '-msse4.2'
@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Apr 27, 2017

Introduced by facebook/rocksdb@bc39732

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Apr 27, 2017

Test-building this now on POWER8

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Apr 27, 2017

@tchaikov This doesn't quite do it

[  308s] CMake Warning:
[  308s]   Manually-specified variables were not used by the project:
[  308s] 
[  308s]     WITH_MSSE42

D'oh, typo.

@@ -768,6 +768,8 @@ if (NOT WITH_SYSTEM_ROCKSDB)
# with SSE 4.2. For details refer to rocksdb/util/crc32c.cc.
if (HAVE_INTEL_SSE4_2)
list(APPEND ROCKSDB_CMAKE_ARGS -DCMAKE_CXX_FLAGS=${SIMD_COMPILE_FLAGS})
else()
list(APPEND ROCKSDB_CMAKE_ARGS -DWITH_MSSE42=OFF)

This comment has been minimized.

@smithfarm

smithfarm Apr 27, 2017

Contributor

@tchaikov - sorry, typo, please s/WITH_MSSE42/WITH_SSE42/

This comment has been minimized.

@smithfarm

smithfarm Apr 27, 2017

Contributor

You might as well wait until I finish testing. . .

smithfarm and others added some commits Apr 27, 2017

build/ops: cmake: explicitly disable MSSE 4.2 if not supported
This became necessary when upstream unconditionally enabled MSSE 4.2
via facebook/rocksdb@bc39732

Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
rocksdb: sync with upstream
to avoid warning with glibc 2.25, see
facebook/rocksdb#2208 and
ceph/rocksdb#17

Signed-off-by: Kefu Chai <kchai@redhat.com>
@tchaikov

This comment has been minimized.

Contributor

tchaikov commented Apr 27, 2017

@smithfarm does it build in your testbed?

@smithfarm

@tchaikov I can confirm that with 5b51dee the POWER8 build succeeds. The latest x86_64 build hasn't finished yet (keeps restarting due to new versions of dependencies becoming available), but that one wasn't problematic.

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Apr 27, 2017

x86_64 build is green, too (in OBS)

@liewegas liewegas merged commit e1065fe into ceph:master Apr 28, 2017

2 of 3 checks passed

Unmodifed Submodules Approval needed: modified submodules found
Details
Signed-off-by all commits in this PR are signed
Details
default Build finished.
Details

@tchaikov tchaikov deleted the tchaikov:wip-rocksdb branch Apr 29, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment