Merge pull request #1042 from ipfs-force-community/cherry-pick-pr-104…

…0-1041-to-release-v0.9 Cherry-pick #1040 #1041 to release v0.9
ipfs-force-community · Nov 30, 2023 · c3dffe6 · c3dffe6
2 parents 81a5e87 + 8a6142a
commit c3dffe6
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 12 deletions.
diff --git a/CHANGELOG.zh.md b/CHANGELOG.zh.md
@@ -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)

diff --git a/damocles-manager/modules/impl/sectors/snapup_commit.go b/damocles-manager/modules/impl/sectors/snapup_commit.go
@@ -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)
 			})
 		}
 

diff --git a/damocles-manager/ver/ver.go b/damocles-manager/ver/ver.go
@@ -2,7 +2,7 @@ package ver
 
 import "fmt"
 
-const Version = "0.9.0"
+const Version = "0.9.1"
 
 var Commit string
 

diff --git a/damocles-worker/Cargo.lock b/damocles-worker/Cargo.lock
diff --git a/damocles-worker/Cargo.toml b/damocles-worker/Cargo.toml
@@ -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"]

diff --git a/damocles-worker/vc-processors/src/builtin/processors/piece/fetcher/http.rs b/damocles-worker/vc-processors/src/builtin/processors/piece/fetcher/http.rs
@@ -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();