Browse Source
Move restore repo to internal router and invoke from command to avoid open the same db file or queues files (#15790) (#15816)
Move restore repo to internal router and invoke from command to avoid open the same db file or queues files (#15790) (#15816)
* Move restore repo to internal router and invoke from command to avoid open the same db file or queues files * Follow @zeripath's review * set no timeout for resotre repo private request * make restore repo cancelablemj-v1.14.3
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 164 additions and 77 deletions
-
77cmd/restore_repo.go
-
52modules/migrations/dump.go
-
60modules/private/restore_repo.go
-
1routers/private/internal.go
-
51routers/private/restore_repo.go
@ -0,0 +1,60 @@ |
|||
// Copyright 2020 The Gitea Authors. All rights reserved.
|
|||
// Use of this source code is governed by a MIT-style
|
|||
// license that can be found in the LICENSE file.
|
|||
|
|||
package private |
|||
|
|||
import ( |
|||
"fmt" |
|||
"io/ioutil" |
|||
"net/http" |
|||
"time" |
|||
|
|||
"code.gitea.io/gitea/modules/setting" |
|||
jsoniter "github.com/json-iterator/go" |
|||
) |
|||
|
|||
// RestoreParams structure holds a data for restore repository
|
|||
type RestoreParams struct { |
|||
RepoDir string |
|||
OwnerName string |
|||
RepoName string |
|||
Units []string |
|||
} |
|||
|
|||
// RestoreRepo calls the internal RestoreRepo function
|
|||
func RestoreRepo(repoDir, ownerName, repoName string, units []string) (int, string) { |
|||
reqURL := setting.LocalURL + "api/internal/restore_repo" |
|||
|
|||
req := newInternalRequest(reqURL, "POST") |
|||
req.SetTimeout(3*time.Second, 0) // since the request will spend much time, don't timeout
|
|||
req = req.Header("Content-Type", "application/json") |
|||
json := jsoniter.ConfigCompatibleWithStandardLibrary |
|||
jsonBytes, _ := json.Marshal(RestoreParams{ |
|||
RepoDir: repoDir, |
|||
OwnerName: ownerName, |
|||
RepoName: repoName, |
|||
Units: units, |
|||
}) |
|||
req.Body(jsonBytes) |
|||
resp, err := req.Response() |
|||
if err != nil { |
|||
return http.StatusInternalServerError, fmt.Sprintf("Unable to contact gitea: %v, could you confirm it's running?", err.Error()) |
|||
} |
|||
defer resp.Body.Close() |
|||
|
|||
if resp.StatusCode != 200 { |
|||
var ret = struct { |
|||
Err string `json:"err"` |
|||
}{} |
|||
body, err := ioutil.ReadAll(resp.Body) |
|||
if err != nil { |
|||
return http.StatusInternalServerError, fmt.Sprintf("Response body error: %v", err.Error()) |
|||
} |
|||
if err := json.Unmarshal(body, &ret); err != nil { |
|||
return http.StatusInternalServerError, fmt.Sprintf("Response body Unmarshal error: %v", err.Error()) |
|||
} |
|||
} |
|||
|
|||
return http.StatusOK, fmt.Sprintf("Restore repo %s/%s successfully", ownerName, repoName) |
|||
} |
@ -0,0 +1,51 @@ |
|||
// Copyright 2021 The Gitea Authors. All rights reserved.
|
|||
// Use of this source code is governed by a MIT-style
|
|||
// license that can be found in the LICENSE file.
|
|||
|
|||
package private |
|||
|
|||
import ( |
|||
"io/ioutil" |
|||
|
|||
myCtx "code.gitea.io/gitea/modules/context" |
|||
"code.gitea.io/gitea/modules/migrations" |
|||
jsoniter "github.com/json-iterator/go" |
|||
) |
|||
|
|||
// RestoreRepo restore a repository from data
|
|||
func RestoreRepo(ctx *myCtx.PrivateContext) { |
|||
json := jsoniter.ConfigCompatibleWithStandardLibrary |
|||
bs, err := ioutil.ReadAll(ctx.Req.Body) |
|||
if err != nil { |
|||
ctx.JSON(500, map[string]string{ |
|||
"err": err.Error(), |
|||
}) |
|||
return |
|||
} |
|||
var params = struct { |
|||
RepoDir string |
|||
OwnerName string |
|||
RepoName string |
|||
Units []string |
|||
}{} |
|||
if err = json.Unmarshal(bs, ¶ms); err != nil { |
|||
ctx.JSON(500, map[string]string{ |
|||
"err": err.Error(), |
|||
}) |
|||
return |
|||
} |
|||
|
|||
if err := migrations.RestoreRepository( |
|||
ctx.Req.Context(), |
|||
params.RepoDir, |
|||
params.OwnerName, |
|||
params.RepoName, |
|||
params.Units, |
|||
); err != nil { |
|||
ctx.JSON(500, map[string]string{ |
|||
"err": err.Error(), |
|||
}) |
|||
} else { |
|||
ctx.Status(200) |
|||
} |
|||
} |
Write
Preview
Loading…
Cancel
Save
Reference in new issue