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: fix the invalid IP address in src/server/test/config.ini #491

Merged
merged 26 commits into from
Mar 4, 2020
Merged

fix: fix the invalid IP address in src/server/test/config.ini #491

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
61cf1a1
1
Smityz Mar 3, 2020
c456325
1
Smityz Mar 3, 2020
dc8184a
run.sh
Smityz Mar 3, 2020
ae72dda
1
Smityz Mar 3, 2020
75ac113
run.sh
Smityz Mar 3, 2020
0775e1f
Merge branch 'fixbug' of github.com:Smityz/pegasus into fixbug
Smityz Mar 3, 2020
5b9018e
run.sh
Smityz Mar 3, 2020
ce8d5f7
run.sh
Smityz Mar 3, 2020
991c835
run.sh
Smityz Mar 3, 2020
defdeba
run.sh
Smityz Mar 3, 2020
ead9d2f
1
Smityz Mar 3, 2020
53666ef
1
Smityz Mar 3, 2020
0c1bdfd
1
Smityz Mar 3, 2020
65695f7
1
Smityz Mar 3, 2020
72cd14e
1
Smityz Mar 3, 2020
0fde449
1
Smityz Mar 3, 2020
861daaf
1
Smityz Mar 3, 2020
8f7aa87
1
Smityz Mar 4, 2020
b19efe1
Merge branch 'fixbug-dev' into fixbug
Smityz Mar 4, 2020
0fe223e
1
Smityz Mar 4, 2020
0c4759c
1
Smityz Mar 4, 2020
5376fbe
1
Smityz Mar 4, 2020
46a8033
1
Smityz Mar 4, 2020
ac87751
1
Smityz Mar 4, 2020
ab60a54
1
Smityz Mar 4, 2020
e8c3588
1
Smityz Mar 4, 2020
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 rdsn
Open in desktop
Submodule rdsn updated 15 files
+10 −2 include/dsn/dist/replication/replication_types.h
+12 −1 include/dsn/tool-api/logging_provider.h
+22 −19 include/dsn/tool-api/rpc_address.h
+35 −33 src/core/core/logging.cpp
+4 −4 src/core/core/service_api_c.cpp
+0 −4 src/core/core/service_engine.cpp
+1 −4 src/core/core/service_engine.h
+2 −2 src/core/core/utils.cpp
+63 −35 src/core/tests/hostname_test.cpp
+5 −9 src/core/tools/common/simple_logger.cpp
+8 −9 src/core/tools/common/simple_logger.h
+1 −1 src/dist/replication/common/replication_common.cpp
+27 −0 src/dist/replication/common/replication_types.cpp
+4 −4 src/dist/replication/meta_server/duplication/meta_duplication_service.cpp
+1 −0 src/dist/replication/replication.thrift
4 changes: 2 additions & 2 deletions src/server/test/config.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,5 +503,5 @@ onebox = 1
onebox2 = 2

[pegasus.clusters]
onebox = @LOCAL_IP@:34701,@LOCAL_IP@:34702,@LOCAL_IP@:34703
onebox2 = @LOCAL_IP@:34701,@LOCAL_IP@:34702,@LOCAL_IP@:34703
onebox = 0.0.0.0:34701,0.0.0.0:34702,0.0.0.0:34703
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

先查为什么travis上LOCAL_IP不会被替换

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里用0.0.0.0的话，后面运行时会替换成本地ip地址吗？

onebox2 = 0.0.0.0:34701,0.0.0.0:34702,0.0.0.0:34703