You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by GitBox <gi...@apache.org> on 2022/12/13 05:54:21 UTC
[GitHub] [doris] ByteYue opened a new pull request, #15030: [feature](BE)pad missed version with empty rowset
ByteYue opened a new pull request, #15030:
URL: https://github.com/apache/doris/pull/15030
# Proposed changes
If all replicas of one tablet are broken, user can use this http api to pad the missed version with empty rowset.
Issue Number: close #xxx
## Problem summary
Describe your changes.
## Checklist(Required)
1. Does it affect the original behavior:
- [ ] Yes
- [x] No
- [ ] I don't know
2. Has unit tests been added:
- [x] Yes
- [ ] No
- [ ] No Need
3. Has document been added or modified:
- [x] Yes
- [ ] No
- [ ] No Need
4. Does it need to update dependencies:
- [ ] Yes
- [x] No
5. Are there any changes that cannot be rolled back:
- [ ] Yes (If Yes, please explain WHY)
- [x] No
## Further comments
If this is a relatively large or complex change, kick off the discussion at [dev@doris.apache.org](mailto:dev@doris.apache.org) by explaining why you chose the solution you did and what alternatives you considered, etc...
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] hello-stephen commented on pull request #15030: [feature](BE)pad missed version with empty rowset
Posted by GitBox <gi...@apache.org>.
hello-stephen commented on PR #15030:
URL: https://github.com/apache/doris/pull/15030#issuecomment-1347803034
TeamCity pipeline, clickbench performance test result:
the sum of best hot time: 34.65 seconds
load time: 442 seconds
storage size: 17123356277 Bytes
https://doris-community-test-1308700295.cos.ap-hongkong.myqcloud.com/tmp/20221213061754_clickbench_pr_62423.html
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] morningman merged pull request #15030: [feature](BE)pad missed version with empty rowset
Posted by GitBox <gi...@apache.org>.
morningman merged PR #15030:
URL: https://github.com/apache/doris/pull/15030
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] platoneko commented on a diff in pull request #15030: [feature](BE)pad missed version with empty rowset
Posted by GitBox <gi...@apache.org>.
platoneko commented on code in PR #15030:
URL: https://github.com/apache/doris/pull/15030#discussion_r1046783041
##########
be/src/http/action/pad_rowset_action.cpp:
##########
@@ -0,0 +1,90 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+#include "http/action/pad_rowset_action.h"
+
+#include <memory>
+
+#include "http/http_channel.h"
+#include "olap/olap_common.h"
+#include "olap/rowset/beta_rowset_writer.h"
+#include "olap/rowset/rowset.h"
+#include "olap/storage_engine.h"
+
+namespace doris {
+
+const std::string TABLET_ID = "tablet_id";
+const std::string VERSION = "version";
+
+void PadRowsetAction::handle(HttpRequest* req) {
+ LOG(INFO) << "accept one request " << req->debug_string();
+ Status status = _handle(req);
+ std::string result = status.to_json();
+ LOG(INFO) << "handle request result:" << result;
+ if (status.ok()) {
+ HttpChannel::send_reply(req, HttpStatus::OK, result);
+ } else {
+ HttpChannel::send_reply(req, HttpStatus::INTERNAL_SERVER_ERROR, result);
+ }
+}
+
+Status PadRowsetAction::_handle(HttpRequest* req) {
+ // Get tablet id
+ const std::string& tablet_id_str = req->param(TABLET_ID);
+ if (tablet_id_str.empty()) {
+ std::string error_msg = std::string("parameter " + TABLET_ID + " not specified in url.");
+ return Status::InternalError(error_msg);
+ }
+
+ // Get schema hash
+ const std::string& version_str = req->param(VERSION);
+ if (version_str.empty()) {
+ std::string error_msg = std::string("parameter " + VERSION + " not specified in url.");
+ return Status::InternalError(error_msg);
+ }
+
+ // valid str format
+ int64_t tablet_id = std::atol(tablet_id_str.c_str());
+ int32_t version = std::atoi(version_str.c_str());
Review Comment:
start_version, end_version may not be equal
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] dataroaring commented on a diff in pull request #15030: [feature](BE)pad missed version with empty rowset
Posted by GitBox <gi...@apache.org>.
dataroaring commented on code in PR #15030:
URL: https://github.com/apache/doris/pull/15030#discussion_r1057631888
##########
be/src/http/action/pad_rowset_action.cpp:
##########
@@ -0,0 +1,105 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+#include "http/action/pad_rowset_action.h"
+
+#include <memory>
+#include <mutex>
+
+#include "http/http_channel.h"
+#include "olap/olap_common.h"
+#include "olap/rowset/beta_rowset_writer.h"
+#include "olap/rowset/rowset.h"
+#include "olap/storage_engine.h"
+
+namespace doris {
+
+const std::string TABLET_ID = "tablet_id";
+const std::string START_VERSION = "start_version";
+const std::string END_VERSION = "end_version";
+
+Status check_one_param(const std::string& param_name, const std::string& param_val) {
+ if (param_val.empty()) {
+ return Status::InternalError("paramater {} not specified in url", param_name);
+ }
+ return Status::OK();
+}
+
+void PadRowsetAction::handle(HttpRequest* req) {
+ LOG(INFO) << "accept one request " << req->debug_string();
+ Status status = _handle(req);
+ std::string result = status.to_json();
+ LOG(INFO) << "handle request result:" << result;
+ if (status.ok()) {
+ HttpChannel::send_reply(req, HttpStatus::OK, result);
+ } else {
+ HttpChannel::send_reply(req, HttpStatus::INTERNAL_SERVER_ERROR, result);
+ }
+}
+
+Status PadRowsetAction::check_param(HttpRequest* req) {
+ RETURN_IF_ERROR(check_one_param(req->param(TABLET_ID), TABLET_ID));
Review Comment:
Arguments is put in wrong position.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] github-actions[bot] commented on pull request #15030: [feature](BE)pad missed version with empty rowset
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on PR #15030:
URL: https://github.com/apache/doris/pull/15030#issuecomment-1365850020
PR approved by at least one committer and no changes requested.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] platoneko commented on a diff in pull request #15030: [feature](BE)pad missed version with empty rowset
Posted by GitBox <gi...@apache.org>.
platoneko commented on code in PR #15030:
URL: https://github.com/apache/doris/pull/15030#discussion_r1048125336
##########
be/src/http/action/pad_rowset_action.cpp:
##########
@@ -0,0 +1,101 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+#include "http/action/pad_rowset_action.h"
+
+#include <memory>
+
+#include "http/http_channel.h"
+#include "olap/olap_common.h"
+#include "olap/rowset/beta_rowset_writer.h"
+#include "olap/rowset/rowset.h"
+#include "olap/storage_engine.h"
+
+namespace doris {
+
+const std::string TABLET_ID = "tablet_id";
+const std::string START_VERSION = "start_version";
+const std::string END_VERSION = "end_version";
+
+Status check_one_param(const std::string& param_name, const std::string& param_val) {
+ if (param_val.empty()) {
+ return Status::InternalError("paramater {} not specified in url", param_name);
+ }
+ return Status::OK();
+}
+
+void PadRowsetAction::handle(HttpRequest* req) {
+ LOG(INFO) << "accept one request " << req->debug_string();
+ Status status = _handle(req);
+ std::string result = status.to_json();
+ LOG(INFO) << "handle request result:" << result;
+ if (status.ok()) {
+ HttpChannel::send_reply(req, HttpStatus::OK, result);
+ } else {
+ HttpChannel::send_reply(req, HttpStatus::INTERNAL_SERVER_ERROR, result);
+ }
+}
+
+Status PadRowsetAction::check_param(HttpRequest* req) {
+ RETURN_IF_ERROR(check_one_param(req->param(TABLET_ID), TABLET_ID));
+ RETURN_IF_ERROR(check_one_param(req->param(START_VERSION), START_VERSION));
+ RETURN_IF_ERROR(check_one_param(req->param(END_VERSION), END_VERSION));
+ return Status::OK();
+}
+
+Status PadRowsetAction::_handle(HttpRequest* req) {
+ RETURN_IF_ERROR(check_param(req));
+
+ const std::string& tablet_id_str = req->param(TABLET_ID);
+ const std::string& start_version_str = req->param(START_VERSION);
+ const std::string& end_version_str = req->param(END_VERSION);
+
+ // valid str format
+ int64_t tablet_id = std::atol(tablet_id_str.c_str());
+ int32_t start_version = std::atoi(start_version_str.c_str());
+ int32_t end_version = std::atoi(end_version_str.c_str());
+ if (start_version < 0 || end_version < 0 || end_version < start_version) {
+ return Status::InternalError("Invalid input version");
+ }
+
+ auto tablet = StorageEngine::instance()->tablet_manager()->get_tablet(tablet_id);
+ if (nullptr == tablet) {
+ return Status::InternalError("Unknown tablet id {}", tablet_id);
+ }
+ return _pad_rowset(tablet, Version(start_version, end_version));
+}
+
+Status PadRowsetAction::_pad_rowset(TabletSharedPtr tablet, const Version& version) {
+ if (tablet->check_version_exist(version)) {
+ return Status::InternalError("Input version {} exists", version.to_string());
+ }
+
+ std::unique_ptr<RowsetWriter> writer;
+ RETURN_IF_ERROR(tablet->create_rowset_writer(version, VISIBLE, NONOVERLAPPING,
+ tablet->tablet_schema(), -1, -1, &writer));
+ auto rowset = writer->build();
+ rowset->make_visible(version);
+
+ std::vector<RowsetSharedPtr> to_add {rowset};
+ std::vector<RowsetSharedPtr> to_delete;
+ tablet->modify_rowsets(to_add, to_delete);
Review Comment:
MUST hold EXCLUSIVE header_lock during `modify_rowsets`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] morningman commented on pull request #15030: [feature](BE)pad missed version with empty rowset
Posted by GitBox <gi...@apache.org>.
morningman commented on PR #15030:
URL: https://github.com/apache/doris/pull/15030#issuecomment-1367046621
> > We can get all broken tablets internal and help user to repair all of them
>
> Would it be too heavy for one pr? I think maybe we can mark it as one future work? We can afterwards provide one sql command which collects all broken tablets's information and then calls the pad http inside this pr in one transaction for consistency.
ok
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] platoneko commented on a diff in pull request #15030: [feature](BE)pad missed version with empty rowset
Posted by GitBox <gi...@apache.org>.
platoneko commented on code in PR #15030:
URL: https://github.com/apache/doris/pull/15030#discussion_r1048125336
##########
be/src/http/action/pad_rowset_action.cpp:
##########
@@ -0,0 +1,101 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+#include "http/action/pad_rowset_action.h"
+
+#include <memory>
+
+#include "http/http_channel.h"
+#include "olap/olap_common.h"
+#include "olap/rowset/beta_rowset_writer.h"
+#include "olap/rowset/rowset.h"
+#include "olap/storage_engine.h"
+
+namespace doris {
+
+const std::string TABLET_ID = "tablet_id";
+const std::string START_VERSION = "start_version";
+const std::string END_VERSION = "end_version";
+
+Status check_one_param(const std::string& param_name, const std::string& param_val) {
+ if (param_val.empty()) {
+ return Status::InternalError("paramater {} not specified in url", param_name);
+ }
+ return Status::OK();
+}
+
+void PadRowsetAction::handle(HttpRequest* req) {
+ LOG(INFO) << "accept one request " << req->debug_string();
+ Status status = _handle(req);
+ std::string result = status.to_json();
+ LOG(INFO) << "handle request result:" << result;
+ if (status.ok()) {
+ HttpChannel::send_reply(req, HttpStatus::OK, result);
+ } else {
+ HttpChannel::send_reply(req, HttpStatus::INTERNAL_SERVER_ERROR, result);
+ }
+}
+
+Status PadRowsetAction::check_param(HttpRequest* req) {
+ RETURN_IF_ERROR(check_one_param(req->param(TABLET_ID), TABLET_ID));
+ RETURN_IF_ERROR(check_one_param(req->param(START_VERSION), START_VERSION));
+ RETURN_IF_ERROR(check_one_param(req->param(END_VERSION), END_VERSION));
+ return Status::OK();
+}
+
+Status PadRowsetAction::_handle(HttpRequest* req) {
+ RETURN_IF_ERROR(check_param(req));
+
+ const std::string& tablet_id_str = req->param(TABLET_ID);
+ const std::string& start_version_str = req->param(START_VERSION);
+ const std::string& end_version_str = req->param(END_VERSION);
+
+ // valid str format
+ int64_t tablet_id = std::atol(tablet_id_str.c_str());
+ int32_t start_version = std::atoi(start_version_str.c_str());
+ int32_t end_version = std::atoi(end_version_str.c_str());
+ if (start_version < 0 || end_version < 0 || end_version < start_version) {
+ return Status::InternalError("Invalid input version");
+ }
+
+ auto tablet = StorageEngine::instance()->tablet_manager()->get_tablet(tablet_id);
+ if (nullptr == tablet) {
+ return Status::InternalError("Unknown tablet id {}", tablet_id);
+ }
+ return _pad_rowset(tablet, Version(start_version, end_version));
+}
+
+Status PadRowsetAction::_pad_rowset(TabletSharedPtr tablet, const Version& version) {
+ if (tablet->check_version_exist(version)) {
+ return Status::InternalError("Input version {} exists", version.to_string());
+ }
+
+ std::unique_ptr<RowsetWriter> writer;
+ RETURN_IF_ERROR(tablet->create_rowset_writer(version, VISIBLE, NONOVERLAPPING,
+ tablet->tablet_schema(), -1, -1, &writer));
+ auto rowset = writer->build();
+ rowset->make_visible(version);
+
+ std::vector<RowsetSharedPtr> to_add {rowset};
+ std::vector<RowsetSharedPtr> to_delete;
+ tablet->modify_rowsets(to_add, to_delete);
Review Comment:
Must hold exclusive header_lock during `modify_rowsets`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] platoneko commented on a diff in pull request #15030: [feature](BE)pad missed version with empty rowset
Posted by GitBox <gi...@apache.org>.
platoneko commented on code in PR #15030:
URL: https://github.com/apache/doris/pull/15030#discussion_r1046781148
##########
be/src/http/action/pad_rowset_action.cpp:
##########
@@ -0,0 +1,90 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+#include "http/action/pad_rowset_action.h"
+
+#include <memory>
+
+#include "http/http_channel.h"
+#include "olap/olap_common.h"
+#include "olap/rowset/beta_rowset_writer.h"
+#include "olap/rowset/rowset.h"
+#include "olap/storage_engine.h"
+
+namespace doris {
+
+const std::string TABLET_ID = "tablet_id";
+const std::string VERSION = "version";
+
+void PadRowsetAction::handle(HttpRequest* req) {
+ LOG(INFO) << "accept one request " << req->debug_string();
+ Status status = _handle(req);
+ std::string result = status.to_json();
+ LOG(INFO) << "handle request result:" << result;
+ if (status.ok()) {
+ HttpChannel::send_reply(req, HttpStatus::OK, result);
+ } else {
+ HttpChannel::send_reply(req, HttpStatus::INTERNAL_SERVER_ERROR, result);
+ }
+}
+
+Status PadRowsetAction::_handle(HttpRequest* req) {
+ // Get tablet id
+ const std::string& tablet_id_str = req->param(TABLET_ID);
+ if (tablet_id_str.empty()) {
+ std::string error_msg = std::string("parameter " + TABLET_ID + " not specified in url.");
Review Comment:
consider `fmt::format`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] github-actions[bot] commented on a diff in pull request #15030: [feature](BE)pad missed version with empty rowset
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on code in PR #15030:
URL: https://github.com/apache/doris/pull/15030#discussion_r1046823060
##########
be/test/olap/tablet_test.cpp:
##########
@@ -252,6 +272,41 @@ TEST_F(TestTablet, delete_expired_stale_rowset) {
_tablet.reset();
}
+TEST_F(TestTablet, pad_rowset) {
+ std::vector<RowsetMetaSharedPtr> rs_metas;
+ auto ptr1 = std::make_shared<RowsetMeta>();
+ init_rs_meta(ptr1, 1, 2);
+ rs_metas.push_back(ptr1);
+ RowsetSharedPtr rowset1 = make_shared<BetaRowset>(nullptr, "", ptr1);
+
+ auto ptr2 = std::make_shared<RowsetMeta>();
+ init_rs_meta(ptr2, 3, 4);
+ rs_metas.push_back(ptr2);
+ RowsetSharedPtr rowset2 = make_shared<BetaRowset>(nullptr, "", ptr2);
+
+ auto ptr3 = std::make_shared<RowsetMeta>();
+ init_rs_meta(ptr3, 6, 7);
+ rs_metas.push_back(ptr3);
+ RowsetSharedPtr rowset3 = make_shared<BetaRowset>(nullptr, "", ptr3);
+
+ for (auto& rowset : rs_metas) {
+ _tablet_meta->add_rs_meta(rowset);
+ }
+
+ _data_dir->init();
+ TabletSharedPtr _tablet(new Tablet(_tablet_meta, _data_dir.get()));
+ _tablet->init();
+
+ Version version(5, 5);
+ std::vector<RowsetReaderSharedPtr> readers;
+ ASSERT_FALSE(_tablet->capture_rs_readers(version, &readers).ok());
+ readers.clear();
+
+ PadRowsetAction action;
+ action._pad_rowset(_tablet, version);
Review Comment:
warning: '_pad_rowset' is a private member of 'doris::PadRowsetAction' [clang-diagnostic-error]
```cpp
action._pad_rowset(_tablet, version);
^
```
**be/src/http/action/pad_rowset_action.h:41:** declared private here
```cpp
Status _pad_rowset(TabletSharedPtr tablet, const Version& version);
^
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] github-actions[bot] commented on a diff in pull request #15030: [feature](BE)pad missed version with empty rowset
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on code in PR #15030:
URL: https://github.com/apache/doris/pull/15030#discussion_r1046688705
##########
be/test/olap/tablet_test.cpp:
##########
@@ -252,6 +272,41 @@ TEST_F(TestTablet, delete_expired_stale_rowset) {
_tablet.reset();
}
+TEST_F(TestTablet, pad_rowset) {
+ std::vector<RowsetMetaSharedPtr> rs_metas;
+ auto ptr1 = std::make_shared<RowsetMeta>();
+ init_rs_meta(ptr1, 1, 2);
+ rs_metas.push_back(ptr1);
+ RowsetSharedPtr rowset1 = make_shared<BetaRowset>(nullptr, "", ptr1);
+
+ auto ptr2 = std::make_shared<RowsetMeta>();
+ init_rs_meta(ptr2, 3, 4);
+ rs_metas.push_back(ptr2);
+ RowsetSharedPtr rowset2 = make_shared<BetaRowset>(nullptr, "", ptr2);
+
+ auto ptr3 = std::make_shared<RowsetMeta>();
+ init_rs_meta(ptr3, 6, 7);
+ rs_metas.push_back(ptr3);
+ RowsetSharedPtr rowset3 = make_shared<BetaRowset>(nullptr, "", ptr3);
+
+ for (auto& rowset : rs_metas) {
+ _tablet_meta->add_rs_meta(rowset);
+ }
+
+ _data_dir->init();
+ TabletSharedPtr _tablet(new Tablet(_tablet_meta, _data_dir.get()));
+ _tablet->init();
+
+ Version version(5, 5);
+ std::vector<RowsetReaderSharedPtr> readers;
+ ASSERT_FALSE(_tablet->capture_rs_readers(version, &readers).ok());
+ readers.clear();
+
+ PadRowsetAction action;
+ action._pad_rowset(_tablet, version);
Review Comment:
warning: '_pad_rowset' is a private member of 'doris::PadRowsetAction' [clang-diagnostic-error]
```cpp
action._pad_rowset(_tablet, version);
^
```
**be/src/http/action/pad_rowset_action.h:40:** declared private here
```cpp
Status _pad_rowset(TabletSharedPtr tablet, const Version& version);
^
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] platoneko commented on a diff in pull request #15030: [feature](BE)pad missed version with empty rowset
Posted by GitBox <gi...@apache.org>.
platoneko commented on code in PR #15030:
URL: https://github.com/apache/doris/pull/15030#discussion_r1048125336
##########
be/src/http/action/pad_rowset_action.cpp:
##########
@@ -0,0 +1,101 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+#include "http/action/pad_rowset_action.h"
+
+#include <memory>
+
+#include "http/http_channel.h"
+#include "olap/olap_common.h"
+#include "olap/rowset/beta_rowset_writer.h"
+#include "olap/rowset/rowset.h"
+#include "olap/storage_engine.h"
+
+namespace doris {
+
+const std::string TABLET_ID = "tablet_id";
+const std::string START_VERSION = "start_version";
+const std::string END_VERSION = "end_version";
+
+Status check_one_param(const std::string& param_name, const std::string& param_val) {
+ if (param_val.empty()) {
+ return Status::InternalError("paramater {} not specified in url", param_name);
+ }
+ return Status::OK();
+}
+
+void PadRowsetAction::handle(HttpRequest* req) {
+ LOG(INFO) << "accept one request " << req->debug_string();
+ Status status = _handle(req);
+ std::string result = status.to_json();
+ LOG(INFO) << "handle request result:" << result;
+ if (status.ok()) {
+ HttpChannel::send_reply(req, HttpStatus::OK, result);
+ } else {
+ HttpChannel::send_reply(req, HttpStatus::INTERNAL_SERVER_ERROR, result);
+ }
+}
+
+Status PadRowsetAction::check_param(HttpRequest* req) {
+ RETURN_IF_ERROR(check_one_param(req->param(TABLET_ID), TABLET_ID));
+ RETURN_IF_ERROR(check_one_param(req->param(START_VERSION), START_VERSION));
+ RETURN_IF_ERROR(check_one_param(req->param(END_VERSION), END_VERSION));
+ return Status::OK();
+}
+
+Status PadRowsetAction::_handle(HttpRequest* req) {
+ RETURN_IF_ERROR(check_param(req));
+
+ const std::string& tablet_id_str = req->param(TABLET_ID);
+ const std::string& start_version_str = req->param(START_VERSION);
+ const std::string& end_version_str = req->param(END_VERSION);
+
+ // valid str format
+ int64_t tablet_id = std::atol(tablet_id_str.c_str());
+ int32_t start_version = std::atoi(start_version_str.c_str());
+ int32_t end_version = std::atoi(end_version_str.c_str());
+ if (start_version < 0 || end_version < 0 || end_version < start_version) {
+ return Status::InternalError("Invalid input version");
+ }
+
+ auto tablet = StorageEngine::instance()->tablet_manager()->get_tablet(tablet_id);
+ if (nullptr == tablet) {
+ return Status::InternalError("Unknown tablet id {}", tablet_id);
+ }
+ return _pad_rowset(tablet, Version(start_version, end_version));
+}
+
+Status PadRowsetAction::_pad_rowset(TabletSharedPtr tablet, const Version& version) {
+ if (tablet->check_version_exist(version)) {
+ return Status::InternalError("Input version {} exists", version.to_string());
+ }
+
+ std::unique_ptr<RowsetWriter> writer;
+ RETURN_IF_ERROR(tablet->create_rowset_writer(version, VISIBLE, NONOVERLAPPING,
+ tablet->tablet_schema(), -1, -1, &writer));
+ auto rowset = writer->build();
+ rowset->make_visible(version);
+
+ std::vector<RowsetSharedPtr> to_add {rowset};
+ std::vector<RowsetSharedPtr> to_delete;
+ tablet->modify_rowsets(to_add, to_delete);
Review Comment:
Must hold header_lock during `modify_rowsets`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] github-actions[bot] commented on pull request #15030: [feature](BE)pad missed version with empty rowset
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on PR #15030:
URL: https://github.com/apache/doris/pull/15030#issuecomment-1365850046
PR approved by anyone and no changes requested.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] ByteYue commented on pull request #15030: [feature](BE)pad missed version with empty rowset
Posted by GitBox <gi...@apache.org>.
ByteYue commented on PR #15030:
URL: https://github.com/apache/doris/pull/15030#issuecomment-1367043166
> We can get all broken tablets internal and help user to repair all of them
Would it be too heavy for one pr? I think maybe we can mark it as one future work? We can afterwards provide one sql command which collects all broken tablets's information and then calls the pad http inside this pr in one transaction for consistency.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org