You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pegasus.apache.org by la...@apache.org on 2021/06/03 09:48:57 UTC
[incubator-pegasus] branch v2.2 updated (0621bb7 -> a81b6c7)
This is an automated email from the ASF dual-hosted git repository.
laiyingchun pushed a change to branch v2.2
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git.
from 0621bb7 chore: bump the version to 2.2.0-mi-beta3
new 5327d8c fix(script): oprimizations for pegasus_rolling_update.sh (#708)
new 1748ee7 fix: overload dump_write_request shouldn't auto-reply to client (#718)
new 2b05c8d doc: Grammar fixes (#715)
new 66a2811 doc: update README.md fix a typo (#730)
new d76906d fix: fix logo missing (#736)
new a81b6c7 chore: bump the version to 2.2.0
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/pull_request_template.md | 12 ++++-----
README.md | 16 ++++++------
rdsn | 2 +-
scripts/pegasus_rolling_update.sh | 36 +++++++++++++++++++--------
src/include/pegasus/version.h | 2 +-
src/server/pegasus_server_impl.cpp | 50 ++++++++++++++------------------------
6 files changed, 60 insertions(+), 58 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pegasus.apache.org
For additional commands, e-mail: commits-help@pegasus.apache.org
[incubator-pegasus] 04/06: doc: update README.md fix a typo (#730)
Posted by la...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
laiyingchun pushed a commit to branch v2.2
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
commit 66a2811891f8c8f94be1857aba4161938ad20167
Author: Ting Sun <11...@mail.sustech.edu.cn>
AuthorDate: Tue May 18 17:06:54 2021 +0800
doc: update README.md fix a typo (#730)
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index f5d5a62..0986a59 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ See our documentation on the [Pegasus Website][website].
## Client drivers
-Pegasus has support for serveral languages:
+Pegasus has support for several languages:
- [Java](https://github.com/xiaomi/pegasus-java-client)
- [C++](https://github.com/apache/incubator-pegasus/blob/master/src/include/pegasus/client.h)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pegasus.apache.org
For additional commands, e-mail: commits-help@pegasus.apache.org
[incubator-pegasus] 02/06: fix: overload dump_write_request
shouldn't auto-reply to client (#718)
Posted by la...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
laiyingchun pushed a commit to branch v2.2
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
commit 1748ee71365f6c826649ff7e548ab216bf2c0c45
Author: Jiashuo <js...@live.com>
AuthorDate: Tue Apr 13 11:21:55 2021 +0800
fix: overload dump_write_request shouldn't auto-reply to client (#718)
---
src/server/pegasus_server_impl.cpp | 50 ++++++++++++++------------------------
1 file changed, 18 insertions(+), 32 deletions(-)
diff --git a/src/server/pegasus_server_impl.cpp b/src/server/pegasus_server_impl.cpp
index 3ea4665..f0d5f50 100644
--- a/src/server/pegasus_server_impl.cpp
+++ b/src/server/pegasus_server_impl.cpp
@@ -2783,49 +2783,35 @@ std::string pegasus_server_impl::dump_write_request(dsn::message_ex *request)
{
dsn::task_code rpc_code(request->rpc_code());
if (rpc_code == dsn::apps::RPC_RRDB_RRDB_PUT) {
- auto put = put_rpc::auto_reply(request).request();
+ auto put = put_rpc(request).request();
::dsn::blob hash_key, sort_key;
pegasus_restore_key(put.key, hash_key, sort_key);
- std::string request("put:");
- request.append("hash_key=")
- .append(pegasus::utils::c_escape_string(hash_key))
- .append(",sort_key=")
- .append(pegasus::utils::c_escape_string(sort_key));
- return request;
+ return fmt::format("put: hash_key={}, sort_key={}",
+ pegasus::utils::c_escape_string(hash_key),
+ pegasus::utils::c_escape_string(sort_key));
}
if (rpc_code == dsn::apps::RPC_RRDB_RRDB_MULTI_PUT) {
- auto multi_put = multi_put_rpc::auto_reply(request).request();
- std::string request("multi_put:");
- request.append("hash_key=")
- .append(pegasus::utils::c_escape_string((multi_put.hash_key))
- .append(",multi_put_count=")
- .append(std::to_string(multi_put.kvs.size())));
- return request;
+ auto multi_put = multi_put_rpc(request).request();
+ return fmt::format("multi_put: hash_key={}, multi_put_count={}",
+ pegasus::utils::c_escape_string(multi_put.hash_key),
+ multi_put.kvs.size());
}
if (rpc_code == dsn::apps::RPC_RRDB_RRDB_CHECK_AND_SET) {
- auto check_and_set = check_and_set_rpc::auto_reply(request).request();
- std::string request("check_and_set:");
- request.append("hash_key=")
- .append(pegasus::utils::c_escape_string(check_and_set.hash_key))
- .append(",check_sort_key=")
- .append(pegasus::utils::c_escape_string(check_and_set.check_sort_key))
- .append(",set_sort_key=")
- .append(pegasus::utils::c_escape_string(check_and_set.set_sort_key));
- return request;
+ auto check_and_set = check_and_set_rpc(request).request();
+ return fmt::format("check_and_set: hash_key={}, check_sort_key={}, set_sort_key={}",
+ pegasus::utils::c_escape_string(check_and_set.hash_key),
+ pegasus::utils::c_escape_string(check_and_set.check_sort_key),
+ pegasus::utils::c_escape_string(check_and_set.set_sort_key));
}
if (rpc_code == dsn::apps::RPC_RRDB_RRDB_CHECK_AND_MUTATE) {
- auto check_and_mutate = check_and_mutate_rpc::auto_reply(request).request();
- std::string request("check_and_mutate:");
- request.append("hash_key=")
- .append(pegasus::utils::c_escape_string(check_and_mutate.hash_key))
- .append(",check_sort_key=")
- .append(pegasus::utils::c_escape_string(check_and_mutate.check_sort_key))
- .append(",set_value_count=")
- .append(std::to_string(check_and_mutate.mutate_list.size()));
- return request;
+ auto check_and_mutate = check_and_mutate_rpc(request).request();
+ return fmt::format("check_and_mutate: hash_key={}, check_sort_key={}, set_value_count={}",
+ pegasus::utils::c_escape_string(check_and_mutate.hash_key),
+ pegasus::utils::c_escape_string(check_and_mutate.check_sort_key),
+ check_and_mutate.mutate_list.size());
}
return "default";
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pegasus.apache.org
For additional commands, e-mail: commits-help@pegasus.apache.org
[incubator-pegasus] 06/06: chore: bump the version to 2.2.0
Posted by la...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
laiyingchun pushed a commit to branch v2.2
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
commit a81b6c78cca29d679ae51d7cf5287334c914e3dd
Author: Yingchun Lai <40...@qq.com>
AuthorDate: Thu Jun 3 17:48:23 2021 +0800
chore: bump the version to 2.2.0
---
rdsn | 2 +-
src/include/pegasus/version.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/rdsn b/rdsn
index 386a431..7ccb58e 160000
--- a/rdsn
+++ b/rdsn
@@ -1 +1 @@
-Subproject commit 386a431202a1899e567684be4f141886d5580d4e
+Subproject commit 7ccb58ed9c6319f1a8ccb5fe28276a8a1014379a
diff --git a/src/include/pegasus/version.h b/src/include/pegasus/version.h
index 1810e34..06809cb 100644
--- a/src/include/pegasus/version.h
+++ b/src/include/pegasus/version.h
@@ -18,4 +18,4 @@
*/
#pragma once
-#define PEGASUS_VERSION "2.2.0-mi-beta3"
+#define PEGASUS_VERSION "2.2.0"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pegasus.apache.org
For additional commands, e-mail: commits-help@pegasus.apache.org
[incubator-pegasus] 01/06: fix(script): oprimizations for
pegasus_rolling_update.sh (#708)
Posted by la...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
laiyingchun pushed a commit to branch v2.2
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
commit 5327d8cbc96826695fcd43f88f227e85c70c901e
Author: Zhang Yifan <ch...@163.com>
AuthorDate: Wed Apr 28 16:38:47 2021 +0800
fix(script): oprimizations for pegasus_rolling_update.sh (#708)
---
scripts/pegasus_rolling_update.sh | 36 ++++++++++++++++++++++++++----------
1 file changed, 26 insertions(+), 10 deletions(-)
diff --git a/scripts/pegasus_rolling_update.sh b/scripts/pegasus_rolling_update.sh
index ecb6002..cb86f9f 100755
--- a/scripts/pegasus_rolling_update.sh
+++ b/scripts/pegasus_rolling_update.sh
@@ -22,7 +22,8 @@
PID=$$
if [ $# -le 3 ]; then
- echo "USAGE: $0 <cluster-name> <cluster-meta-list> <type> <start_task_id>"
+ echo "USAGE: $0 <cluster-name> <cluster-meta-list> <type> <start_task_id> "
+ "<rebalance_cluster_after_rolling>(default false) <rebalance_only_move_primary>(default true)"
echo
echo "The type may be 'one' or 'all':"
echo " - one: rolling update only one task of replica server."
@@ -48,6 +49,18 @@ if [ "$type" != "one" -a "$type" != "all" ]; then
exit 1
fi
+if [ -z $5 ]; then
+ rebalance_cluster_after_rolling=false
+else
+ rebalance_cluster_after_rolling=$5
+fi
+
+if [ -z $6 ]; then
+ rebalance_only_move_primary=true
+else
+ rebalance_only_move_primary=$6
+fi
+
pwd="$( cd "$( dirname "$0" )" && pwd )"
shell_dir="$( cd $pwd/.. && pwd )"
cd $shell_dir
@@ -222,14 +235,6 @@ do
echo "remote_command -l $node flush-log" | ./run.sh shell --cluster $meta_list &>/dev/null
- echo "Set lb.add_secondary_max_count_for_one_node to 100..."
- echo "remote_command -l $pmeta meta.lb.add_secondary_max_count_for_one_node 100" | ./run.sh shell --cluster $meta_list &>/tmp/$UID.$PID.pegasus.rolling_update.add_secondary_max_count_for_one_node
- set_ok=`grep OK /tmp/$UID.$PID.pegasus.rolling_update.add_secondary_max_count_for_one_node | wc -l`
- if [ $set_ok -ne 1 ]; then
- echo "ERROR: set lb.add_secondary_max_count_for_one_node to 100 failed"
- exit 1
- fi
-
echo "Rolling update by minos..."
minos_rolling_update $cluster replica $task_id
echo "Rolling update by minos done."
@@ -250,6 +255,14 @@ do
echo
sleep 1
+ echo "Set lb.add_secondary_max_count_for_one_node to 100..."
+ echo "remote_command -l $pmeta meta.lb.add_secondary_max_count_for_one_node 100" | ./run.sh shell --cluster $meta_list &>/tmp/$UID.$PID.pegasus.rolling_update.add_secondary_max_count_for_one_node
+ set_ok=`grep OK /tmp/$UID.$PID.pegasus.rolling_update.add_secondary_max_count_for_one_node | wc -l`
+ if [ $set_ok -ne 1 ]; then
+ echo "ERROR: set lb.add_secondary_max_count_for_one_node to 100 failed"
+ exit 1
+ fi
+
echo "Wait cluster to become healthy..."
while true
do
@@ -294,8 +307,11 @@ if [ "$type" = "all" ]; then
minos_rolling_update $cluster collector
echo "Rolling update collectors done."
echo
+fi
- ./scripts/pegasus_rebalance_cluster.sh $cluster $meta_list
+if [ "$rebalance_cluster_after_rolling" == "true" ]; then
+ echo "Start to rebalance cluster..."
+ ./scripts/pegasus_rebalance_cluster.sh $cluster $meta_list $rebalance_only_move_primary
fi
echo "Finish time: `date`"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pegasus.apache.org
For additional commands, e-mail: commits-help@pegasus.apache.org
[incubator-pegasus] 05/06: fix: fix logo missing (#736)
Posted by la...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
laiyingchun pushed a commit to branch v2.2
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
commit d76906d7b459b82d97684714e601cd4f64ce7626
Author: Yingchun Lai <40...@qq.com>
AuthorDate: Wed May 26 08:56:04 2021 +0800
fix: fix logo missing (#736)
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 0986a59..4864114 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
[hbase]: https://hbase.apache.org/
[website]: https://pegasus.apache.org
-
+
[](https://travis-ci.org/apache/incubator-pegasus)
[](https://www.apache.org/licenses/LICENSE-2.0.html)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pegasus.apache.org
For additional commands, e-mail: commits-help@pegasus.apache.org
[incubator-pegasus] 03/06: doc: Grammar fixes (#715)
Posted by la...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
laiyingchun pushed a commit to branch v2.2
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
commit 2b05c8d64f48eb34545ed694e31064d124b86f76
Author: fredster33 <64...@users.noreply.github.com>
AuthorDate: Tue Apr 6 21:00:00 2021 -0700
doc: Grammar fixes (#715)
---
.github/pull_request_template.md | 12 ++++++------
README.md | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 3d32ccf..f061b78 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,32 +1,32 @@
### What problem does this PR solve? <!--add issue link with summary if exists-->
-### What is changed and how it works?
+### What is changed and how does it work?
-### Check List <!--REMOVE the items that are not applicable-->
+### Checklist <!--REMOVE the items that are not applicable-->
-Tests <!-- At least one of them must be included. -->
+##### Tests <!-- At least one of them must be included. -->
- Unit test
- Integration test
- Manual test (add detailed scripts or steps below)
- No code
-Code changes
+##### Code changes
- Has exported function/method change
- Has exported variable/fields change
- Has interface methods change
- Has persistent data change
-Side effects
+##### Side effects
- Possible performance regression
- Increased code complexity
- Breaking backward compatibility
-Related changes
+##### Related changes
- Need to cherry-pick to the release branch
- Need to update the documentation
diff --git a/README.md b/README.md
index cb83835..f5d5a62 100644
--- a/README.md
+++ b/README.md
@@ -11,8 +11,8 @@
[](https://www.apache.org/licenses/LICENSE-2.0.html)
[][github-release]
-**Note**: The `master` branch may be in an *unstable or even broken state* during development.
-Please use [releases][github-release] instead of the `master` branch in order to get stable binaries.
+**Note**: The `master` branch may be in an *unstable or even in a broken state* during development.
+Please use [GitHub Releases][github-release] instead of the `master` branch in order to get stable binaries.
Apache Pegasus is a distributed key-value storage system which is designed to be:
@@ -44,7 +44,7 @@ between data centers, automatic load balancing, and online partition split.
## To start using Pegasus
-See our documentation on [Pegasus Website][website].
+See our documentation on the [Pegasus Website][website].
## Client drivers
@@ -59,9 +59,9 @@ Pegasus has support for serveral languages:
## Contact us
-- Send mails to Apache Pegasus dev mailing list: dev@pegasus.apache.org. This is the place where topics around development, community, and problems are officially discussed. Please remember to subsribe the mail list via dev-subscribe@pegasus.apache.org.
+- Send emails to the Apache Pegasus developer mailing list: `dev@pegasus.apache.org`. This is the place where topics around development, community, and problems are officially discussed. Please remember to subscribe to the mailing list via `dev-subscribe@pegasus.apache.org`.
-- Github Issues: submit an issue when you have any idea to improve Pegasus, and when you encountered some bugs or problems.
+- GitHub Issues: submit an issue when you have any idea to improve Pegasus, and when you encountered some bugs or problems.
## Related Projects
@@ -80,4 +80,4 @@ Data import/export tools:
## License
Copyright 2020 The Apache Software Foundation. Licensed under the Apache License, Version 2.0:
-<http://www.apache.org/licenses/LICENSE-2.0>
+[http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pegasus.apache.org
For additional commands, e-mail: commits-help@pegasus.apache.org