Skip to content

Commit

Permalink
cmake: add --progress flag to git submodule update commands
Browse files Browse the repository at this point in the history
Ceph has lots of submodules that needs to be cloned before building
binaries from the repository. Seeing the progress when these submodules
are being cloned is useful, especially when developers/users have a
network issue or a slow network.

Signed-off-by: Rishabh Dave <[email protected]>
  • Loading branch information
rishabh-d-dave committed Oct 31, 2023
1 parent 54fea2e commit eb69954
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ following commands to move into the cloned `ceph/ceph` repository and to check
out the git submodules associated with it:

cd ceph
git submodule update --init --recursive
git submodule update --init --recursive --progress


## Build Prerequisites
Expand Down
2 changes: 1 addition & 1 deletion do_cmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -ex

if [ -d .git ]; then
git submodule update --init --recursive
git submodule update --init --recursive --progress
fi

: ${BUILD_DIR:=build}
Expand Down
2 changes: 1 addition & 1 deletion doc/dev/corpus.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ script of ``script/gen-corpus.sh``, or by following the instructions below:

git clone ceph.git
cd ceph
git submodule update --init --recursive
git submodule update --init --recursive --progress

#. Build with flag to dump objects to ``/tmp/foo``::

Expand Down
4 changes: 2 additions & 2 deletions doc/install/clone-source.rst
Original file line number Diff line number Diff line change
Expand Up @@ -154,13 +154,13 @@ Updating Submodules

.. prompt:: bash $

git submodule update --force --init --recursive
git submodule update --force --init --recursive --progress
git clean -fdx
git submodule foreach git clean -fdx

If you still have problems with a submodule directory, use ``rm -rf
[directory name]`` to remove the directory. Then run ``git submodule update
--init --recursive`` again.
--init --recursive --progress`` again.

#. Run ``git status`` again:

Expand Down
2 changes: 1 addition & 1 deletion make-dist
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ echo "version $version"
# update submodules
echo "updating submodules..."
force=$(if git submodule usage 2>&1 | grep --quiet 'update.*--force'; then echo --force ; fi)
if ! git submodule sync || ! git submodule update $force --init --recursive; then
if ! git submodule sync || ! git submodule update $force --init --recursive --progress; then
echo "Error: could not initialize submodule projects"
echo " Network connectivity might be required."
exit 1
Expand Down
2 changes: 1 addition & 1 deletion qa/workunits/rados/test_envlibrados_for_rocksdb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ if [ -e rocksdb ]; then
fi

pushd $(dirname /home/ubuntu/cephtest/clone.client.0/qa/workunits/rados/bash.sh)/../../../
git submodule update --init src/rocksdb
git submodule update --init --progress src/rocksdb
popd
git clone $(dirname /home/ubuntu/cephtest/clone.client.0/qa/workunits/rados/bash.sh)/../../../src/rocksdb rocksdb

Expand Down

0 comments on commit eb69954

Please sign in to comment.