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.

Sign up for GitHub

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

[Bug] handle k8s error #239

Merged
merged 2 commits into from
Aug 13, 2018
Merged

[Bug] handle k8s error #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dcf792a
handle k8s error
John-Lin Aug 9, 2018
3296272
make test pass
John-Lin Aug 9, 2018
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
13 changes: 11 additions & 2 deletions src/server/handler_pod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/linkernetworks/vortex/src/net/http/query"
"github.com/linkernetworks/vortex/src/pod"
"github.com/linkernetworks/vortex/src/web"
"k8s.io/apimachinery/pkg/api/errors"

mgo "gopkg.in/mgo.v2"
"gopkg.in/mgo.v2/bson"
Expand Down Expand Up @@ -47,7 +48,11 @@ func createPodHandler(ctx *web.Context) {
}

if err := pod.CreatePod(sp, &p); err != nil {
response.InternalServerError(req.Request, resp.ResponseWriter, err)
if errors.IsAlreadyExists(err) {
response.Conflict(req.Request, resp.ResponseWriter, fmt.Errorf("Pod Name: %s already existed", p.Name))
} else {
response.InternalServerError(req.Request, resp.ResponseWriter, err)
}
return
}
if err := session.Insert(entity.PodCollectionName, &p); err != nil {
Expand Down Expand Up @@ -76,7 +81,11 @@ func deletePodHandler(ctx *web.Context) {
}

if err := pod.DeletePod(sp, &p); err != nil {
response.InternalServerError(req.Request, resp.ResponseWriter, err)
if errors.IsNotFound(err) {
response.NotFound(req.Request, resp.ResponseWriter, err)
} else {
response.InternalServerError(req.Request, resp.ResponseWriter, err)
}
return
}

Expand Down
2 changes: 1 addition & 1 deletion src/server/handler_pod_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ func (suite *PodTestSuite) TestCreatePod() {
httpRequest.Header.Add("Content-Type", "application/json")
httpWriter = httptest.NewRecorder()
suite.wc.Dispatch(httpWriter, httpRequest)
assertResponseCode(suite.T(), http.StatusInternalServerError, httpWriter)
assertResponseCode(suite.T(), http.StatusConflict, httpWriter)
Copy link
Contributor

Choose a reason for hiding this comment

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

Create fail since the body is empty. so the return is InternalServcer

Copy link
Contributor Author

Choose a reason for hiding this comment

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

應該不是這個問題，因為他會創同一個podname預期是要conflict


err = p.DeletePod(suite.sp, &retPod)
suite.NoError(err)
Expand Down
2 changes: 1 addition & 1 deletion src/server/handler_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ func deleteServiceHandler(ctx *web.Context) {
}

if err := service.DeleteService(sp, &s); err != nil {
if errors.IsAlreadyExists(err) {
if errors.IsNotFound(err) {
response.NotFound(req.Request, resp.ResponseWriter, err)
} else {
response.InternalServerError(req.Request, resp.ResponseWriter, err)
Expand Down
7 changes: 6 additions & 1 deletion src/server/handler_storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"github.com/linkernetworks/vortex/src/web"
mgo "gopkg.in/mgo.v2"
"gopkg.in/mgo.v2/bson"
"k8s.io/apimachinery/pkg/api/errors"
)

func createStorage(ctx *web.Context) {
Expand Down Expand Up @@ -54,7 +55,11 @@ func createStorage(ctx *web.Context) {
}

if err := storageProvider.CreateStorage(sp, &storage); err != nil {
response.InternalServerError(req.Request, resp.ResponseWriter, err)
if errors.IsAlreadyExists(err) {
response.Conflict(req.Request, resp.ResponseWriter, fmt.Errorf("Storage Name: %s already existed", storage.Name))
} else {
response.InternalServerError(req.Request, resp.ResponseWriter, err)
}
return
}

Expand Down
14 changes: 11 additions & 3 deletions src/server/handler_volume.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/linkernetworks/vortex/src/net/http/query"
"github.com/linkernetworks/vortex/src/volume"
"github.com/linkernetworks/vortex/src/web"
"k8s.io/apimachinery/pkg/api/errors"

mgo "gopkg.in/mgo.v2"
"gopkg.in/mgo.v2/bson"
Expand Down Expand Up @@ -43,8 +44,11 @@ func createVolume(ctx *web.Context) {
v.CreatedAt = timeutils.Now()
//Generate the metaName for PVC meta name and we will use it future
if err := volume.CreateVolume(sp, &v); err != nil {
response.InternalServerError(req.Request, resp.ResponseWriter, err)
return
if errors.IsAlreadyExists(err) {
response.Conflict(req.Request, resp.ResponseWriter, fmt.Errorf("PVC Name: %s already existed", v.Name))
} else {
response.InternalServerError(req.Request, resp.ResponseWriter, err)
}
}
if err := session.Insert(entity.VolumeCollectionName, &v); err != nil {
if mgo.IsDup(err) {
Expand Down Expand Up @@ -72,7 +76,11 @@ func deleteVolume(ctx *web.Context) {
}

if err := volume.DeleteVolume(sp, &v); err != nil {
response.InternalServerError(req.Request, resp.ResponseWriter, err)
if errors.IsNotFound(err) {
response.NotFound(req.Request, resp.ResponseWriter, err)
} else {
response.InternalServerError(req.Request, resp.ResponseWriter, err)
}
return
}

Expand Down