Skip to content
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: 4 additions & 1 deletion internal/service/cache_job_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,10 @@ func (c *CacheJobService) StopCacheJob(jobStatusReq *query.JobStatusReq) error {
}
_, err = util.PostForDomain(speedDomain, "/api/cacheJob/stop", "application/json", b, c.hfTokenDao.GetHeaders())
if err != nil {
return err
err = c.cacheJobDao.UpdateCacheStatus(&query.UpdateJobStatusReq{Id: jobStatusReq.Id, Status: consts.RunningStatusJobStop})
if err != nil {
return err
}
}
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion internal/service/repository_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ func (s *RepositoryService) MountRepository(repoReq *query.RepositoryReq) error
authHeaders = s.hfTokenDao.GetHeaders()
}

_, err = util.PostForDomain(speedDomain, "/api/cacheJob/create", "application/json", b, s.hfTokenDao.GetHeaders())
_, err = util.PostForDomain(speedDomain, "/api/cacheJob/create", "application/json", b, authHeaders)
if err != nil {
return err
}
Expand Down
55 changes: 1 addition & 54 deletions pkg/util/http_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,18 @@ import (
"net"
"net/http"
"net/url"
"strings"
"sync"
"time"

"dingoscheduler/pkg/common"
"dingoscheduler/pkg/config"
"dingoscheduler/pkg/consts"

"github.com/avast/retry-go"
"go.uber.org/zap"
)

var (
reqTimeout = 0 * time.Second
reqTimeout = 10 * time.Second
simpleClient *http.Client
proxyClient *http.Client
simpleOnce sync.Once
Expand Down Expand Up @@ -171,44 +169,6 @@ func doGet(client *http.Client, targetURL string, headers map[string]string) (*c
}, nil
}

func GetStream(domain, uri string, headers map[string]string, f func(r *http.Response) error) error {
var (
client *http.Client
err error
)
if IsInnerDomain(domain) {
client, err = NewHTTPClient()
} else {
domain, client, err = constructClient()
}
if err != nil {
return fmt.Errorf("construct http client err: %v", err)
}
requestURL := fmt.Sprintf("%s%s", domain, uri)
return doGetStream(client, requestURL, headers, f)
}

func doGetStream(client *http.Client, targetURL string, headers map[string]string, f func(r *http.Response) error) error {
escapedURL := strings.ReplaceAll(targetURL, "#", "%23")
req, err := http.NewRequest("GET", escapedURL, nil)
if err != nil {
return fmt.Errorf("创建GET请求失败: %v", err)
}
for key, value := range headers {
req.Header.Set(key, value)
}
resp, err := client.Do(req)
if err != nil {
return err
}
defer resp.Body.Close()
respHeaders := make(map[string]interface{})
for key, value := range resp.Header {
respHeaders[key] = value
}
return f(resp)
}

func PostForDomain(domain, requestUri string, contentType string, data []byte, headers map[string]string) (*common.Response, error) {
client, err := NewHTTPClient()
if err != nil {
Expand All @@ -218,15 +178,6 @@ func PostForDomain(domain, requestUri string, contentType string, data []byte, h
return doPost(client, requestURL, contentType, data, headers)
}

func Post(requestUri string, contentType string, data []byte, headers map[string]string) (*common.Response, error) {
domain, client, err := constructClient()
if err != nil {
return nil, fmt.Errorf("construct http client err: %v", err)
}
requestURL := fmt.Sprintf("%s%s", domain, requestUri)
return doPost(client, requestURL, contentType, data, headers)
}

func doPost(client *http.Client, targetURL string, contentType string, data []byte, headers map[string]string) (*common.Response, error) {
req, err := http.NewRequest("POST", targetURL, bytes.NewBuffer(data))
if err != nil {
Expand Down Expand Up @@ -267,7 +218,3 @@ func doPost(client *http.Client, targetURL string, contentType string, data []by
Body: body,
}, nil
}

func IsInnerDomain(url string) bool {
return !strings.Contains(url, consts.Huggingface) && !strings.Contains(url, consts.Hfmirror)
}