Skip to content
This repository has been archived by the owner on Jan 21, 2024. It is now read-only.

fix: timeout error caused by upload processing for more than 30 seconds #813

Merged
merged 1 commit into from
Jan 6, 2023

Conversation

longjuan
Copy link
Member

@longjuan longjuan commented Jan 6, 2023

What type of PR is this?

/kind improvement

What this PR does / why we need it:

Remove the timeout error prompt caused by the upload server processing for more than 30 seconds

Which issue(s) this PR fixes:

Fixes halo-dev/halo#3041

Screenshots:

image
image

Special notes for your reviewer:

测试:
上传大文件让后端处理过程超过30秒,观察是否报错
或使用修改后的插件上传到对象存储,观察61秒后是否上传成功

Does this PR introduce a user-facing change?

去除上传文件处理时间超过30秒后的报错

@f2c-ci-robot f2c-ci-robot bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/improvement Categorizes issue or PR as related to a improvement. labels Jan 6, 2023
@vercel
Copy link

vercel bot commented Jan 6, 2023

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Updated
ui ✅ Ready (Inspect) Visit Preview Jan 6, 2023 at 2:35AM (UTC)

@CLAassistant
Copy link

CLAassistant commented Jan 6, 2023

CLA assistant check
All committers have signed the CLA.

Copy link
Member

@ruibaby ruibaby left a comment

Choose a reason for hiding this comment

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

/approve

Nice work!

@f2c-ci-robot f2c-ci-robot bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 6, 2023
@ruibaby
Copy link
Member

ruibaby commented Jan 6, 2023

/cherry-pick release-2.0
/cherry-pick release-2.1

@halo-dev-bot
Copy link

@ruibaby: once the present PR merges, I will cherry-pick it on top of release-2.0 in a new PR and assign it to you.

In response to this:

/cherry-pick release-2.0
/cherry-pick release-2.1

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ruibaby
Copy link
Member

ruibaby commented Jan 6, 2023

/cherry-pick release-2.1

@halo-dev-bot
Copy link

@ruibaby: once the present PR merges, I will cherry-pick it on top of release-2.1 in a new PR and assign it to you.

In response to this:

/cherry-pick release-2.1

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Copy link
Member

@JohnNiang JohnNiang left a comment

Choose a reason for hiding this comment

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

/lgtm

@f2c-ci-robot f2c-ci-robot bot added the lgtm Indicates that a PR is ready to be merged. label Jan 6, 2023
@f2c-ci-robot
Copy link

f2c-ci-robot bot commented Jan 6, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JohnNiang, ruibaby

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@halo-dev-bot
Copy link

@ruibaby: new pull request created: #814

In response to this:

/cherry-pick release-2.0
/cherry-pick release-2.1

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@halo-dev-bot
Copy link

@ruibaby: new pull request created: #815

In response to this:

/cherry-pick release-2.1

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

f2c-ci-robot bot pushed a commit that referenced this pull request Jan 6, 2023
… than 30 seconds (#815)

This is an automated cherry-pick of #813

/assign ruibaby

```release-note
去除上传文件处理时间超过30秒后的报错
```
f2c-ci-robot bot pushed a commit that referenced this pull request Jan 6, 2023
… than 30 seconds (#814)

This is an automated cherry-pick of #813

/assign ruibaby

```release-note
去除上传文件处理时间超过30秒后的报错
```
@ruibaby ruibaby added this to the 2.2.0 milestone Jan 31, 2023
@longjuan longjuan deleted the fix/uppy-timeout branch February 25, 2023 06:12
JohnNiang pushed a commit to JohnNiang/halo that referenced this pull request Mar 2, 2023
…ds (halo-dev/console#813)

<!--  Thanks for sending a pull request!  Here are some tips for you:
1. 如果这是你的第一次,请阅读我们的贡献指南:<https://github.com/halo-dev/halo/blob/master/CONTRIBUTING.md>。
1. If this is your first time, please read our contributor guidelines: <https://github.com/halo-dev/halo/blob/master/CONTRIBUTING.md>.
2. 请根据你解决问题的类型为 Pull Request 添加合适的标签。
2. Please label this pull request according to what type of issue you are addressing, especially if this is a release targeted pull request.
3. 请确保你已经添加并运行了适当的测试。
3. Ensure you have added or ran the appropriate tests for your PR.
-->

#### What type of PR is this?

<!--
添加其中一个类别:
Add one of the following kinds:
/kind bug
/kind cleanup
/kind documentation
/kind feature
/kind optimization
适当添加其中一个或多个类别(可选):
Optionally add one or more of the following kinds if applicable:
/kind api-change
/kind deprecation
/kind failing-test
/kind flake
/kind regression
-->
/kind improvement
#### What this PR does / why we need it:
Remove the timeout error prompt caused by the upload server processing for more than 30 seconds
#### Which issue(s) this PR fixes:

<!--
PR 合并时自动关闭 issue。
Automatically closes linked issue when PR is merged.
用法:`Fixes #<issue 号>`,或者 `Fixes (粘贴 issue 完整链接)`
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
-->
Fixes halo-dev#3041
#### Screenshots:

<!--
如果此 PR 有 UI 的改动,最好截图说明这个 PR 的改动。
If there are UI changes to this PR, it is best to take a screenshot to illustrate the changes to this PR.
eg.
Before:
![screenshot-before](https://user-images.githubusercontent.com/screenshot.png)
After:
![screenshot-after](https://user-images.githubusercontent.com/screenshot.png)
-->
![image](https://user-images.githubusercontent.com/28662535/210917239-b4b050f8-766f-4289-9ba2-ccb99bb6ac55.png)
![image](https://user-images.githubusercontent.com/28662535/210917273-c6291485-f420-4f02-a7c8-2b4b286110d4.png)


#### Special notes for your reviewer:
测试:
上传大文件让后端处理过程超过30秒,观察是否报错
或使用[修改后的插件](https://github.com/longjuan/halo-plugin-s3os/actions/runs/3852075387)上传到对象存储,观察61秒后是否上传成功
#### Does this PR introduce a user-facing change?

<!--
如果当前 Pull Request 的修改不会造成用户侧的任何变更,在 `release-note` 代码块儿中填写 `NONE`。
否则请填写用户侧能够理解的 Release Note。如果当前 Pull Request 包含破坏性更新(Break Change),
Release Note 需要以 `action required` 开头。
If no, just write "NONE" in the release-note block below.
If yes, a release note is required:
Enter your extended release note in the block below. If the PR requires additional action from users switching to the new release, include the string "action required".
-->

```release-note
去除上传文件处理时间超过30秒后的报错
```
# for free to subscribe to this conversation on GitHub. Already have an account? #.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/improvement Categorizes issue or PR as related to a improvement. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

上传附件或者主题报错,超过30秒
5 participants