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.

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

Cherry-pick #1040 #1041 to release v0.9 #1042

Merged
merged 3 commits into from
Nov 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions CHANGELOG.zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,16 @@
## v0.9.1

- damocles-manager
- 修复 snapup 移除旧扇区文件报错 [#1040](https://github.com/ipfs-force-community/damocles/pull/1040)
- unseal 命令默认去掉 padding [#1026](https://github.com/ipfs-force-community/damocles/pull/1026)

- damocles-worker
- 修复无法从统一链服务入口获取 piece 文件 [#1041](https://github.com/ipfs-force-community/damocles/pull/1041)

## v0.9.0

## v0.9.0-rc7
- damocles-manager
- 暂时移除 `move partition` 相关的命令 [#1022](https://github.com/ipfs-force-community/damocles/pull/1022)
- 修复 wait for message, 如果消息失败了则不继续等待消息而是直接返回错误。[#1024](https://github.com/ipfs-force-community/damocles/pull/1024)
- 优化 wdpost, 允许 worker 向任意状态的任务发送心跳。[#1028](https://github.com/ipfs-force-community/damocles/pull/1028)
Expand Down
2 changes: 1 addition & 1 deletion damocles-manager/modules/impl/sectors/snapup_commit.go
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,7 @@ func (h *snapupCommitHandler) cleanupForSector() error {
return nil
}

return fmt.Errorf("attempt to del obj %q: %w", uri, err)
return fmt.Errorf("attempt to del obj %q: %w", uri, delErr)
})
}

Expand Down
2 changes: 1 addition & 1 deletion damocles-manager/ver/ver.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package ver

import "fmt"

const Version = "0.9.0"
const Version = "0.9.1"

var Commit string

Expand Down
2 changes: 1 addition & 1 deletion damocles-worker/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion damocles-worker/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "damocles-worker"
version = "0.9.0"
version = "0.9.1"
authors = ["dtynn <dtynn@163.com>"]
edition = "2021"
exclude = [".github"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,16 @@ impl<U: IntoUrl> PieceFetcher<U> for PieceHttpFetcher {

let mut req = self.redirect_client.get(redirect_url);
if let Some(token) = self.token.as_ref() {
req = req.header(
header::AUTHORIZATION,
format!(
"{} {}",
Self::HEADER_AUTHORIZATION_BEARER_PREFIX,
token
),
)
req = req
.header(
header::AUTHORIZATION,
format!(
"{} {}",
Self::HEADER_AUTHORIZATION_BEARER_PREFIX,
token
),
)
.header("X-VENUS-API-NAMESPACE", "v1.IMarket")
};
resp = req.send().context("request to redirected location")?;
status_code = resp.status();
Expand Down
Loading