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

temporarily disable the jobservice in the multi-user mode #2733

Merged
merged 4 commits into from
Dec 16, 2019
Merged

temporarily disable the jobservice in the multi-user mode #2733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
171ddeb
temporarily disable the jobservice in the multi-user mode
gaoning777 Dec 13, 2019
cf351f4
disable the visualization service in the multi-user mode
gaoning777 Dec 13, 2019
ba57ac9
disable with user friendly messages
gaoning777 Dec 13, 2019
2159063
addressing comments; enable list/enable/disable api such that UI work…
gaoning777 Dec 13, 2019
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
8 changes: 8 additions & 0 deletions backend/src/apiserver/server/job_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@ import (

"github.com/golang/protobuf/ptypes/empty"
api "github.com/kubeflow/pipelines/backend/api/go_client"
"github.com/kubeflow/pipelines/backend/src/apiserver/common"
"github.com/kubeflow/pipelines/backend/src/apiserver/model"
"github.com/kubeflow/pipelines/backend/src/apiserver/resource"
"github.com/kubeflow/pipelines/backend/src/common/util"
"github.com/pkg/errors"
"github.com/robfig/cron"
)

Expand All @@ -30,6 +32,9 @@ type JobServer struct {
}

func (s *JobServer) CreateJob(ctx context.Context, request *api.CreateJobRequest) (*api.Job, error) {
if common.IsMultiUserMode() == true {
return nil, util.NewBadRequestError(errors.New("Job APIs are temporarily disabled in the multi-user mode until it is fully ready."), "Job APIs are temporarily disabled in the multi-user mode until it is fully ready.")
}
err := s.validateCreateJobRequest(request)
if err != nil {
return nil, err
Expand Down Expand Up @@ -76,6 +81,9 @@ func (s *JobServer) DisableJob(ctx context.Context, request *api.DisableJobReque
}

func (s *JobServer) DeleteJob(ctx context.Context, request *api.DeleteJobRequest) (*empty.Empty, error) {
if common.IsMultiUserMode() == true {
return nil, util.NewBadRequestError(errors.New("Job APIs are temporarily disabled in the multi-user mode until it is fully ready."), "Job APIs are temporarily disabled in the multi-user mode until it is fully ready.")
}
err := s.resourceManager.DeleteJob(request.Id)
if err != nil {
return nil, err
Expand Down
6 changes: 6 additions & 0 deletions backend/src/apiserver/server/visualization_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@ import (
"github.com/golang/glog"
"github.com/kubeflow/pipelines/backend/api/go_client"
"github.com/kubeflow/pipelines/backend/src/apiserver/resource"
"github.com/kubeflow/pipelines/backend/src/apiserver/common"
"github.com/kubeflow/pipelines/backend/src/common/util"
"io/ioutil"
"net/http"
"net/url"
"strings"

"github.com/pkg/errors"
)

type VisualizationServer struct {
Expand All @@ -20,6 +23,9 @@ type VisualizationServer struct {
}

func (s *VisualizationServer) CreateVisualization(ctx context.Context, request *go_client.CreateVisualizationRequest) (*go_client.Visualization, error) {
if common.IsMultiUserMode() == true {
return nil, util.NewBadRequestError(errors.New("Visualization APIs are temporarily disabled in the multi-user mode until it is fully ready."), "Visualization APIs are temporarily disabled in the multi-user mode until it is fully ready.")
}
if err := s.validateCreateVisualizationRequest(request); err != nil {
return nil, err
}
Expand Down