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

fix: move config_hdfs.sh to scripts directory #775

Merged
merged 2 commits into from
Jun 29, 2021
Merged

fix: move config_hdfs.sh to scripts directory #775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6975fd
fix: move config_hdfs.sh to scripts directory
zhangyifan27 Jun 28, 2021
b3fcea6
add config_hdfs.sh
zhangyifan27 Jun 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci-pull-request.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,5 @@ jobs:
run: ./run.sh pack_tools
- name: Unit Testing
run: |
source ./config_hdfs.sh
source ./scripts/config_hdfs.sh
./run.sh test --on_travis
2 changes: 1 addition & 1 deletion rdsn
Open in desktop
Submodule rdsn updated 78 files
+8 −1 .github/workflows/pull_request.yaml
+4 −4 README.md
+0 −2,516 doc/Doxyfile
+0 −202 doc/DoxygenLayout.rDSN.xml
+0 −41 doc/eon.overview.h
+0 −111 doc/examples.complexity.h
+0 −676 doc/examples.layer1.h
+0 −164 doc/examples.layer2.h
+0 −127 doc/examples.network.h
+ − doc/imgs/icon.png
+ − doc/imgs/rdsn-layer2.jpg
+0 −63 doc/main.md
+1 −1 include/dsn/dist/replication/replication.codes.h
+5 −0 include/dsn/dist/replication/replication_enums.h
+0 −72 include/dsn/tool-api/admission_controller.h
+0 −5 include/dsn/tool-api/task_queue.h
+0 −4 include/dsn/tool-api/task_spec.h
+0 −8 include/dsn/tool-api/threadpool_spec.h
+1 −0 include/dsn/tool-api/timer_service.h
+0 −4 include/dsn/tool_api.h
+1 −0 include/dsn/utility/error_code.h
+11 −0 include/dsn/utility/filesystem.h
+6 −0 include/dsn/utility/join_point.h
+ − resources/arch.png
+ − resources/config.png
+ − resources/rdsn-QR.png
+ − resources/viz.png
+5 −1 src/aio/test/main.cpp
+1 −1 src/block_service/block_service_manager.cpp
+2 −0 src/client/partition_resolver_simple.cpp
+1 −0 src/common/consensus.thrift
+50 −14 src/common/fs_manager.cpp
+27 −5 src/common/fs_manager.h
+6 −0 src/common/metadata.thrift
+123 −91 src/common/replication_common.cpp
+11 −2 src/common/replication_common.h
+103 −0 src/common/test/replication_common_test.cpp
+15 −1 src/meta/meta_backup_service.cpp
+8 −1 src/meta/meta_service.cpp
+1 −0 src/meta/meta_service.h
+1 −1 src/meta/meta_service_app.cpp
+22 −0 src/meta/test/backup_test.cpp
+0 −3 src/nfs/test/nfs_test_file1
+0 −2 src/nfs/test/nfs_test_file2
+2 −2 src/replica/bulk_load/replica_bulk_loader.cpp
+60 −0 src/replica/mutation_log.cpp
+4 −7 src/replica/mutation_log.h
+6 −0 src/replica/replica.h
+5 −0 src/replica/replica_2pc.cpp
+4 −0 src/replica/replica_check.cpp
+1 −0 src/replica/replica_config.cpp
+15 −0 src/replica/replica_context.cpp
+5 −0 src/replica/replica_context.h
+89 −73 src/replica/replica_learn.cpp
+78 −29 src/replica/replica_stub.cpp
+6 −0 src/replica/replica_stub.h
+0 −58 src/replica/replication_admission_controller.cpp
+0 −55 src/replica/replication_admission_controller.h
+97 −1 src/replica/test/mutation_log_test.cpp
+44 −0 src/replica/test/replica_disk_test.cpp
+54 −2 src/replica/test/replica_disk_test_base.h
+1 −0 src/runtime/rpc/rpc_engine.h
+20 −16 src/runtime/service_engine.cpp
+1 −4 src/runtime/service_engine.h
+12 −2 src/runtime/task/simple_task_queue.cpp
+4 −1 src/runtime/task/simple_task_queue.h
+46 −28 src/runtime/task/task_engine.cpp
+3 −3 src/runtime/task/task_engine.h
+2 −0 src/runtime/task/task_engine.sim.h
+2 −2 src/runtime/task/task_queue.cpp
+0 −5 src/runtime/task/task_spec.cpp
+0 −1 src/runtime/test/config-test-corrupt-message.ini
+0 −2 src/runtime/test/config-test-sim.ini
+0 −3 src/runtime/test/config-test.ini
+0 −5 src/runtime/test/main.cpp
+0 −111 src/runtime/test/task_engine.cpp
+0 −7 src/runtime/tool_api.cpp
+70 −0 src/utils/filesystem.cpp
0 config_hdfs.sh → scripts/config_hdfs.sh
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion scripts/pack_server.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ copy_file ./rdsn/thirdparty/output/lib/sasl2 ${pack}/bin
copy_file ./scripts/sendmail.sh ${pack}/bin
copy_file ./src/server/config.ini ${pack}/bin
copy_file ./src/server/config.min.ini ${pack}/bin
copy_file ./config_hdfs.sh ${pack}/bin
copy_file ./scripts/config_hdfs.sh ${pack}/bin

copy_file "$(get_stdcpp_lib $custom_gcc)" "${pack}/bin"

Expand Down
2 changes: 1 addition & 1 deletion scripts/travis.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ if [ "$modified" ]; then
exit 1
fi

source "${root}"/config_hdfs.sh
source "${root}"/scripts/config_hdfs.sh
"${root}"/run.sh build -c --skip_thirdparty --disable_gperf && ./run.sh test --on_travis
ret=$?
if [ $ret ]; then
Expand Down