Skip to content

GitLab

C
ceph
Commit f1eb70af authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Further ARM32 patching

parent e9f1c6fc
Show whitespace changes
Inline Side-by-side
Showing with 82 additions and 6 deletions
Makefile
View file @ f1eb70af
......@@ -35,12 +35,14 @@ all: ceph-config
patch -Np1 -d ceph-15.2.4 < ceph-15.2.4-fix_tests.patch
patch -Np1 -d ceph-15.2.4 < ceph-15.2.4-fix_ceph-volume_systemd_unit.patch
patch -Np1 -d ceph-15.2.4 < ceph-15.2.4-no_git.patch
patch -Np1 -d ceph-15.2.4 < ceph-15.2.4-arm32_fix.patch
if [ `uname -m` = 'armv7l' ] ; then \
patch -Np1 -d ceph-15.2.4 < ceph-15.2.4-arm32_fix.patch ; \
fi
cd ceph-15.2.4 && ./do_cmake.sh -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LIBEXECDIR=/lib -DWITH_SPDK=OFF -DWITH_RDMA=OFF -DWITH_RADOSGW_AMQP_ENDPOINT=OFF -DWITH_PYTHON2=OFF -DWITH_PYTHON3=ON
$(MAKE) -C ceph-15.2.4/build npm_config_cache=/build/.npm NODE_OPTIONS="--max-old-space-size=4096"
$(MAKE) -C ceph-15.2.4/build npm_config_cache=/build/.npm NODE_OPTIONS="--max-old-space-size=3072"
hostname localhost
cd ceph-15.2.4 && tar xf ../ceph-object-corpus.tar.xz
cd ceph-15.2.4/build && CTEST_OUTPUT_ON_FAILURE=1 NODE_OPTIONS="--max-old-space-size=4096" make check
cd ceph-15.2.4/build && CTEST_OUTPUT_ON_FAILURE=1 NODE_OPTIONS="--max-old-space-size=3072" make check
$(MAKE) -C ceph-15.2.4/build install
rm /usr/bin/ceph_test*
......
ceph-15.2.4-arm32_fix.patch
View file @ f1eb70af
diff -uNr ceph-15.2.4/src/client/Client.cc ceph-15.2.4-arm32_fix/src/client/Client.cc
--- ceph-15.2.4/src/client/Client.cc 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-arm32_fix/src/client/Client.cc 2020-09-08 08:14:52.404501135 +0930
+++ ceph-15.2.4-arm32_fix/src/client/Client.cc 2020-09-12 06:45:46.270513787 +0930
@@ -10948,7 +10948,7 @@
ldout(cct, 20) << __func__ << " " << in << " " << in->ino << " -> " << in->ll_ref << dendl;
}
......@@ -30,7 +30,16 @@ diff -uNr ceph-15.2.4/src/client/Client.cc ceph-15.2.4-arm32_fix/src/client/Clie
return _ll_forget(in, count);
diff -uNr ceph-15.2.4/src/client/Client.h ceph-15.2.4-arm32_fix/src/client/Client.h
--- ceph-15.2.4/src/client/Client.h 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-arm32_fix/src/client/Client.h 2020-09-08 08:19:52.091603922 +0930
+++ ceph-15.2.4-arm32_fix/src/client/Client.h 2020-09-12 06:47:40.450891708 +0930
@@ -482,7 +482,7 @@
int ll_lookupx(Inode *parent, const char *name, Inode **out,
struct ceph_statx *stx, unsigned want, unsigned flags,
const UserPerm& perms);
- bool ll_forget(Inode *in, uint64_t count);
+ bool ll_forget(Inode *in, size_t count);
bool ll_put(Inode *in);
int ll_get_snap_ref(snapid_t snap);
@@ -1028,7 +1028,7 @@
void _fragmap_remove_stopped_mds(Inode *in, mds_rank_t mds);
......@@ -49,9 +58,21 @@ diff -uNr ceph-15.2.4/src/client/Client.h ceph-15.2.4-arm32_fix/src/client/Clien
uint32_t deleg_timeout = 0;
diff -uNr ceph-15.2.4/src/client/fuse_ll.cc ceph-15.2.4-arm32_fix/src/client/fuse_ll.cc
--- ceph-15.2.4/src/client/fuse_ll.cc 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-arm32_fix/src/client/fuse_ll.cc 2020-09-13 23:36:31.892114974 +0930
@@ -191,7 +191,7 @@
}
static void fuse_ll_forget(fuse_req_t req, fuse_ino_t ino,
- long unsigned nlookup)
+ uint64_t nlookup)
{
CephFuse::Handle *cfuse = fuse_ll_req_prepare(req);
cfuse->client->ll_forget(cfuse->iget(ino), nlookup+1);
diff -uNr ceph-15.2.4/src/mds/PurgeQueue.h ceph-15.2.4-arm32_fix/src/mds/PurgeQueue.h
--- ceph-15.2.4/src/mds/PurgeQueue.h 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-arm32_fix/src/mds/PurgeQueue.h 2020-09-08 08:14:52.404501135 +0930
+++ ceph-15.2.4-arm32_fix/src/mds/PurgeQueue.h 2020-09-12 06:45:46.271513791 +0930
@@ -219,6 +219,6 @@
size_t purge_item_journal_size;
......@@ -60,3 +81,56 @@ diff -uNr ceph-15.2.4/src/mds/PurgeQueue.h ceph-15.2.4-arm32_fix/src/mds/PurgeQu
+ size_t files_high_water = 0;
};
#endif
diff -uNr ceph-15.2.4/src/pybind/mgr/dashboard/frontend/package.json ceph-15.2.4-arm32_fix/src/pybind/mgr/dashboard/frontend/package.json
--- ceph-15.2.4/src/pybind/mgr/dashboard/frontend/package.json 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-arm32_fix/src/pybind/mgr/dashboard/frontend/package.json 2020-09-15 13:07:06.419370484 +0930
@@ -122,7 +122,6 @@
"@types/node": "12.12.34",
"@types/simplebar": "5.1.1",
"codelyzer": "5.2.2",
- "cypress": "4.4.0",
"html-linter": "1.1.1",
"htmllint-cli": "0.0.7",
"jest": "25.2.4",
diff -uNr ceph-15.2.4/src/test/libcephfs/ceph_pthread_self.h ceph-15.2.4-arm32_fix/src/test/libcephfs/ceph_pthread_self.h
--- ceph-15.2.4/src/test/libcephfs/ceph_pthread_self.h 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-arm32_fix/src/test/libcephfs/ceph_pthread_self.h 2020-09-16 16:40:24.320825307 +0930
@@ -25,7 +25,7 @@
static_assert(std::is_convertible_v<decltype(me), uint64_t> ||
std::is_pointer_v<decltype(me)>,
"we need to use pthread_self() for the owner parameter");
- return reinterpret_cast<uint64_t>(me);
+ return reinterpret_cast<uint64_t>((uint64_t) me);
}
#endif
diff -uNr ceph-15.2.4/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc ceph-15.2.4-arm32_fix/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc
--- ceph-15.2.4/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-arm32_fix/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc 2020-09-16 00:30:00.677530051 +0930
@@ -234,7 +234,7 @@
json_spirit::mObject root_obj;
root_obj["replay_state"] = replay_state;
- root_obj["remote_snapshot_timestamp"] = remote_snap_info->timestamp.sec();
+ root_obj["remote_snapshot_timestamp"] = (uint64_t) remote_snap_info->timestamp.sec();
auto matching_remote_snap_id = util::compute_remote_snap_id(
m_state_builder->local_image_ctx->image_lock,
@@ -249,7 +249,7 @@
// the local snapshot would just be the time the snapshot was
// synced and not the consistency point in time.
root_obj["local_snapshot_timestamp"] =
- matching_remote_snap_it->second.timestamp.sec();
+ (uint64_t) matching_remote_snap_it->second.timestamp.sec();
}
matching_remote_snap_it = m_state_builder->remote_image_ctx->snap_info.find(
@@ -257,7 +257,7 @@
if (m_remote_snap_id_end != CEPH_NOSNAP &&
matching_remote_snap_it !=
m_state_builder->remote_image_ctx->snap_info.end()) {
- root_obj["syncing_snapshot_timestamp"] = remote_snap_info->timestamp.sec();
+ root_obj["syncing_snapshot_timestamp"] = (uint64_t) remote_snap_info->timestamp.sec();
root_obj["syncing_percent"] = static_cast<uint64_t>(
100 * m_local_mirror_snap_ns.last_copied_object_number /
static_cast<float>(std::max<uint64_t>(1U, m_local_object_count)));
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment