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

Jump to bottom

Prettify output #200

Merged
merged 2 commits into from
Jul 4, 2017
Merged

Prettify output #200

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
2f59037
prettify output
Jul 4, 2017
dde9e8a
remove replica set name
Jul 4, 2017
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
21 changes: 20 additions & 1 deletion docker/paddle_k8s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,23 @@ start_pserver() {
--num_gradient_servers=$PADDLE_INIT_NUM_GRADIENT_SERVERS
}

check_trainer_ret() {
ret=$1
echo "job returned $ret...setting pod return message..."
echo "==============================="
if [ $ret -eq 136 ] ; then
echo "Error Arithmetic Operation(Floating Point Exception)" > /dev/termination-log
elif [ $ret -eq 139 ] ; then
echo "Segmentation Fault" > /dev/termination-log
elif [ $ret -eq 1 ] ; then
echo "General Error" > /dev/termination-log
elif [ $ret -eq 134 ] ; then
echo "Program Abort" > /dev/termination-log
Copy link
Collaborator

Choose a reason for hiding this comment

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

Deal with an unknown return code?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

unknown就不现实message了，ret code还是可以看到的

fi
echo "termination log wroted..."
exit $ret
}

start_trainer() {
python /root/k8s_tools.py wait_pods_running paddle-job-pserver=${PADDLE_JOB_NAME} ${PSERVERS}
python /root/k8s_tools.py wait_pods_running paddle-job=${PADDLE_JOB_NAME} ${TRAINERS}
Expand Down Expand Up @@ -47,9 +64,11 @@ start_trainer() {
--save_dir=$OUTPUT \
--pservers=$PADDLE_INIT_PSERVERS \
--num_gradient_servers=$PADDLE_INIT_NUM_GRADIENT_SERVERS
check_trainer_ret $?
;;
"v2")
${ENTRY}
sh -c "${ENTRY}"
check_trainer_ret $?
;;
*)
;;
Expand Down
65 changes: 56 additions & 9 deletions go/paddlecloud/get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,18 +77,28 @@ func workers(jobname string) error {
fmt.Fprintf(os.Stderr, "bad server return: %s", respBody)
return err
}

w := tabwriter.NewWriter(os.Stdout, 0, 0, 3, ' ', 0)

fmt.Fprintln(w, "NAME\tSTATUS\tSTART\t")
fmt.Fprintln(w, "NAME\tSTATUS\tSTART\tEXIT_CODE\tMSG\t")
if err != nil {
fmt.Fprintf(os.Stderr, "error parsing: %s", err)
return err
}
for _, item := range respObj.(map[string]interface{})["items"].([]interface{}) {
fmt.Fprintf(w, "%s\t%s\t%v\t\n",
var exitCode, msg interface{}
terminateState := item.(map[string]interface{})["status"].(map[string]interface{})["container_statuses"].([]interface{})[0].(map[string]interface{})["state"].(map[string]interface{})["terminated"]

if terminateState != nil {
exitCode = terminateState.(map[string]interface{})["exit_code"]
msg = terminateState.(map[string]interface{})["message"]
}

fmt.Fprintf(w, "%s\t%s\t%v\t%v\t%v\t\n",
item.(map[string]interface{})["metadata"].(map[string]interface{})["name"].(string),
item.(map[string]interface{})["status"].(map[string]interface{})["phase"].(string),
item.(map[string]interface{})["status"].(map[string]interface{})["start_time"])
item.(map[string]interface{})["status"].(map[string]interface{})["start_time"],
exitCode, msg)
}
w.Flush()
return nil
Expand Down Expand Up @@ -122,34 +132,71 @@ func registry() error {
w.Flush()
return err
}

func jobs() error {
respBody, err := restclient.GetCall(Config.ActiveConfig.Endpoint+"/api/v1/jobs/", nil)
// NOTE: a job include pserver replicaset and a trainers job, display them
// get pserver replicaset
// "status": {
// "available_replicas": 1,
// "conditions": null,
// "fully_labeled_replicas": 1,
// "observed_generation": 1,
// "ready_replicas": 1,
// "replicas": 1
var respObj interface{}

respBody, err := restclient.GetCall(Config.ActiveConfig.Endpoint+"/api/v1/pservers/", nil)
if err != nil {
fmt.Fprintf(os.Stderr, "error getting pservers: %v\n", err)
return err
}
err = json.Unmarshal(respBody, &respObj)
if err != nil {
return err
}
pserverItems := respObj.(map[string]interface{})["items"].([]interface{})

// get kubernetes jobs info
respBody, err = restclient.GetCall(Config.ActiveConfig.Endpoint+"/api/v1/jobs/", nil)
if err != nil {
fmt.Fprintf(os.Stderr, "error getting jobs: %v\n", err)
return err
}
var respObj interface{}

err = json.Unmarshal(respBody, &respObj)
if err != nil {
return err
}
items := respObj.(map[string]interface{})["items"].([]interface{})

w := tabwriter.NewWriter(os.Stdout, 0, 0, 3, ' ', 0)
if len(items) >= 0 {
fmt.Fprintf(w, "NUM\tNAME\tSUCC\tFAIL\tSTART\tCOMP\tACTIVE\t\n")
fmt.Fprintf(w, "NAME\tACTIVE\tSUCC\tFAIL\tSTART\tCOMP\tPS_READY\tPS_TOTAL\t\n")
}
for idx, j := range items {
for _, j := range items {
jobnameTrainer := j.(map[string]interface{})["metadata"].(map[string]interface{})["name"].(string)
jobnameParts := strings.Split(jobnameTrainer, "-")
jobname := strings.Join(jobnameParts[0:len(jobnameParts)-1], "-")
// get info for job pservers
var psrsname string
var readyReplicas, replicas interface{}
for _, psrs := range pserverItems {
psrsname = psrs.(map[string]interface{})["metadata"].(map[string]interface{})["name"].(string)
if psrsname == jobname+"-pserver" {
readyReplicas = psrs.(map[string]interface{})["status"].(map[string]interface{})["ready_replicas"]
replicas = psrs.(map[string]interface{})["status"].(map[string]interface{})["replicas"]
break
}
}

fmt.Fprintf(w, "%d\t%s\t%v\t%v\t%v\t%v\t%v\t\n", idx,
fmt.Fprintf(w, "%s\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t\n",
jobname,
j.(map[string]interface{})["status"].(map[string]interface{})["active"],
j.(map[string]interface{})["status"].(map[string]interface{})["succeeded"],
j.(map[string]interface{})["status"].(map[string]interface{})["failed"],
j.(map[string]interface{})["status"].(map[string]interface{})["start_time"],
j.(map[string]interface{})["status"].(map[string]interface{})["completion_time"],
j.(map[string]interface{})["status"].(map[string]interface{})["active"])
readyReplicas, replicas)
}
w.Flush()

Expand Down
1 change: 1 addition & 0 deletions paddlecloud/paddlecloud/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
url(r'^api/sample/$', notebook.views.SampleView.as_view()),

url(r"^api/v1/jobs/", paddlejob.views.JobsView.as_view()),
url(r"^api/v1/pservers/", paddlejob.views.PserversView.as_view()),
url(r"^api/v1/logs/", paddlejob.views.LogsView.as_view()),
url(r"^api/v1/workers/", paddlejob.views.WorkersView.as_view()),
url(r"^api/v1/quota/", paddlejob.views.QuotaView.as_view()),
Expand Down
13 changes: 13 additions & 0 deletions paddlecloud/paddlejob/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,19 @@ def delete(self, request, format=None):
retcode = 200
return utils.simple_response(retcode, "\n".join(delete_status))

class PserversView(APIView):
permission_classes = (permissions.IsAuthenticated,)

def get(self, request, format=None):
"""
List all pservers
"""
username = request.user.username
namespace = notebook.utils.email_escape(username)
api_instance = client.ExtensionsV1beta1Api(api_client=notebook.utils.get_user_api_client(username))
pserver_rs_list = api_instance.list_namespaced_replica_set(namespace)
return Response(pserver_rs_list.to_dict())


class LogsView(APIView):
permission_classes = (permissions.IsAuthenticated,)
Expand Down