On Aug 20, 2019, Alexandre Oliva <oliva@xxxxxxx> wrote:
>> if you are able to pinpoint an FTBFS issue or bug while using Ceph on
>> 32 bit platforms. i can take a look at it.
> Oh, thanks, I didn't mean to burden anyone with that, it's just
> something that I care about and would be happy to undertake myself. I
> was just surprised that there weren't i686 ceph packages in Fedora 30,
> and found comments in the spec file suggesting it didn't work, but I
> didn't look into why yet.
Here's the patch I used to disable spdk in my rebuilds of the Fedora 30
packages.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3b95cc231d2c..ba4fc8506651 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -267,7 +267,7 @@ if(WITH_BLUESTORE)
endif()
endif()
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i686|amd64|x86_64|AMD64|aarch64")
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")
option(WITH_SPDK "Enable SPDK" ON)
else()
option(WITH_SPDK "Enable SPDK" OFF)
With the following additional tweaks, I could even build 32-bit x86
packages. The problems seem to be all related with int types.
For example, this one fixes an assumption that size_t and unsigned are
not the same type:
diff --git a/src/include/buffer.h b/src/include/buffer.h
index b8c78210eae0..8e010a150224 100644
--- a/src/include/buffer.h
+++ b/src/include/buffer.h
@@ -737,7 +737,7 @@ inline namespace v14_2_0 {
void advance(int o) = delete;
void advance(unsigned o);
- void advance(size_t o) { advance(static_cast<unsigned>(o)); }
+ void advance(unsigned long o) { advance(static_cast<unsigned>(o)); }
void seek(unsigned o);
char operator*() const;
iterator_impl& operator++();
This one was the simplest fix I could find to address problems in other
overloads that did not expect unsigned, only int64_t and uint64_t.
Though I'm not sure this change gets to external representations, I
figured it made sense to settle on a well-defined width instead of
letting it vary across platforms, and to go with the width used in the
prevalent, working platforms:
diff --git a/src/common/config_values.h b/src/common/config_values.h
index ab52060e4629..17eb11d0329d 100644
--- a/src/common/config_values.h
+++ b/src/common/config_values.h
@@ -50,7 +50,7 @@ public:
#define OPTION_OPT_U32(name) uint64_t name;
#define OPTION_OPT_U64(name) uint64_t name;
#define OPTION_OPT_UUID(name) uuid_d name;
-#define OPTION_OPT_SIZE(name) size_t name;
+#define OPTION_OPT_SIZE(name) uint64_t name;
#define OPTION(name, ty) \
public: \
OPTION_##ty(name)
This is probably the only fallout from the above:
diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index 19bd1a3efd5d..0dcf50ca10cb 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -1628,7 +1628,7 @@ void PrimaryLogPG::calc_trim_to()
limit != pg_trim_to &&
pg_log.get_log().approx_size() > target) {
size_t num_to_trim = std::min(pg_log.get_log().approx_size() - target,
- cct->_conf->osd_pg_log_trim_max);
+ size_t(cct->_conf->osd_pg_log_trim_max));
if (num_to_trim < cct->_conf->osd_pg_log_trim_min &&
cct->_conf->osd_pg_log_trim_max >= cct->_conf->osd_pg_log_trim_min) {
return;
encode/decode don't handle long at all, they deal with u?int{32,64}_t
and uint64_t. When int64_t happens to be int or long, this works, but
when int64_t is long long, then long ends up uncovered:
diff --git a/src/test/bufferlist.cc b/src/test/bufferlist.cc
index 8a5bc65d31da..adcdcf3b7b68 100644
--- a/src/test/bufferlist.cc
+++ b/src/test/bufferlist.cc
@@ -837,7 +837,7 @@ TEST(BufferListIterator, iterate_with_empties) {
EXPECT_EQ(bl.length(), 0u);
EXPECT_EQ(bl.get_num_buffers(), 1u);
- encode(42l, bl);
+ encode(int64_t(42l), bl);
EXPECT_EQ(bl.get_num_buffers(), 2u);
bl.push_back(ceph::buffer::create(0));
@@ -853,11 +853,11 @@ TEST(BufferListIterator, iterate_with_empties) {
bl.append(bl_with_empty_ptr);
}
- encode(24l, bl);
+ encode(int64_t(24l), bl);
EXPECT_EQ(bl.get_num_buffers(), 5u);
auto i = bl.cbegin();
- long val;
+ int64_t val;
decode(val, i);
EXPECT_EQ(val, 42l);
@@ -865,7 +865,7 @@ TEST(BufferListIterator, iterate_with_empties) {
EXPECT_EQ(val, 24l);
val = 0;
- i.seek(sizeof(long));
+ i.seek(sizeof(val));
decode(val, i);
EXPECT_EQ(val, 24l);
EXPECT_TRUE(i == bl.end());
@@ -2665,7 +2665,7 @@ TEST(BufferList, InternalCarriage) {
ceph::bufferlist bl;
EXPECT_EQ(bl.get_num_buffers(), 0u);
- encode(42l, bl);
+ encode(int64_t(42l), bl);
EXPECT_EQ(bl.get_num_buffers(), 1u);
{
@@ -2678,7 +2678,7 @@ TEST(BufferList, InternalCarriage) {
EXPECT_EQ(bl.get_num_buffers(), 2u);
}
- encode(24l, bl);
+ encode(int64_t(24l), bl);
EXPECT_EQ(bl.get_num_buffers(), 3u);
}
@@ -2690,7 +2690,7 @@ TEST(BufferList, ContiguousAppender) {
{
auto ap = bl.get_contiguous_appender(100);
- denc(42l, ap);
+ denc(int64_t(42l), ap);
EXPECT_EQ(bl.get_num_buffers(), 1u);
// append bufferlist with single ptr inside. This should
@@ -2707,11 +2707,11 @@ TEST(BufferList, ContiguousAppender) {
EXPECT_EQ(bl.get_num_buffers(), 3u);
}
- denc(24l, ap);
+ denc(int64_t(24l), ap);
EXPECT_EQ(bl.get_num_buffers(), 3u);
- EXPECT_EQ(bl.length(), sizeof(long) + 3u);
+ EXPECT_EQ(bl.length(), sizeof(int64_t) + 3u);
}
- EXPECT_EQ(bl.length(), 2u * sizeof(long) + 3u);
+ EXPECT_EQ(bl.length(), 2u * sizeof(int64_t) + 3u);
}
TEST(BufferList, TestPtrAppend) {
That was all it took to build ceph-14.2.2-1.fc30 on x86_64 and i686. I
haven't even had a chance to check that the resulting packages install,
and I won't be able to get to them before I'm back home on Thu, but
these are simple enough that I figured I'd post them before I got my
attention on something else ;-)
I hope this helps,
--
Alexandre Oliva, freedom fighter he/him https://FSFLA.org/blogs/lxo
Be the change, be Free! FSF Latin America board member
GNU Toolchain Engineer Free Software Evangelist
Hay que enGNUrecerse, pero sin perder la terGNUra jamás - Che GNUevara
_______________________________________________
Dev mailing list -- dev@xxxxxxx
To unsubscribe send an email to dev-leave@xxxxxxx
