Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Rainbond2
Commits
029fd7d5
Commit
029fd7d5
authored
6 years ago
by
GLYASAI
Browse files
Options
Download
Email Patches
Plain Diff
[DEL] remove debug message
parent
9b9c9b6d
main
Develop-V5.X
V5.0
V5.1
V5.2
V5.3
V5.4
dependabot/npm_and_yarn/webcli/js/xterm-4.5.0
feat-V5.10
feat-V5.10.1
feat-containerd
feat-containerd1
feature-helmapp
feature-helmapp-2
feature-k8s
fixbug-560
gitee
master
mesh-start
servicemonitor
zqhtest-containerd
v5.10.0-release
v5.9.0-release
v5.8.1-release
v5.8.0-release
v5.7.1-release
v5.7.0-release
v5.6.0-release
v5.5.0-release
v5.5.0-dind
v5.4.1-release
v5.4.0-release
v5.3.3-release
v5.3.2-release
v5.3.1-release
v5.3.0-release
v5.2.2-release
v5.2.1-release
v5.2.0-release
v5.2.0-beta2
v5.2.0-beta1
v5.1.11-release
v5.1.10-release
v5.1.9-release
v5.1.8-release
v5.1.6-release
v5.1.5-release
v5.1.4-release
v5.1.3-release
v5.1.2-release
v5.1.1-release
v5.1.0-release
v5.0.4-release
v5.0.3-release
v5.0.1-release
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
api/handler/service.go
+11
-18
api/handler/service.go
worker/server/server.go
+0
-1
worker/server/server.go
with
11 additions
and
19 deletions
+11
-19
api/handler/service.go
+
11
-
18
View file @
029fd7d5
...
...
@@ -20,36 +20,30 @@ package handler
import
(
"context"
"encoding/json"
"fmt"
"net/http"
"os"
"strings"
"time"
"github.com/goodrain/rainbond/cmd/api/option"
"github.com/goodrain/rainbond/worker/server/pb"
"github.com/Sirupsen/logrus"
"github.com/coreos/etcd/clientv3"
"github.com/goodrain/rainbond/db"
core_model
"github.com/goodrain/rainbond/db/model"
"github.com/goodrain/rainbond/event"
"github.com/twinj/uuid"
"github.com/jinzhu/gorm"
"github.com/pquerna/ffjson/ffjson"
api_model
"github.com/goodrain/rainbond/api/model"
"github.com/goodrain/rainbond/api/util"
"github.com/goodrain/rainbond/cmd/api/option"
"github.com/goodrain/rainbond/db"
core_model
"github.com/goodrain/rainbond/db/model"
dbmodel
"github.com/goodrain/rainbond/db/model"
"github.com/goodrain/rainbond/event"
gclient
"github.com/goodrain/rainbond/mq/client"
core_util
"github.com/goodrain/rainbond/util"
"github.com/goodrain/rainbond/worker/client"
"github.com/goodrain/rainbond/worker/discover/model"
"encoding/json"
"net/http"
"github.com/Sirupsen/logrus"
"github.com/goodrain/rainbond/worker/server/pb"
"github.com/jinzhu/gorm"
"github.com/pquerna/ffjson/ffjson"
"github.com/twinj/uuid"
)
//ServiceAction service act
...
...
@@ -1428,7 +1422,6 @@ func (s *ServiceAction) GetPods(serviceID string) ([]*K8sPodInfo, error) {
podInfo
.
PodIP
=
v
.
PodIp
podInfo
.
PodStatus
=
v
.
PodStatus
for
_
,
container
:=
range
v
.
Containers
{
logrus
.
Debugf
(
"container name: %s; memory limit: %d"
,
container
.
ContainerName
,
container
.
MemoryLimit
)
containerInfos
[
container
.
ContainerName
]
=
map
[
string
]
string
{
"memory_limit"
:
fmt
.
Sprintf
(
"%d"
,
container
.
MemoryLimit
),
"memory_usage"
:
"0"
,
...
...
This diff is collapsed.
Click to expand it.
worker/server/server.go
+
0
-
1
View file @
029fd7d5
...
...
@@ -119,7 +119,6 @@ func (r *RuntimeServer) GetAppPods(ctx context.Context, re *pb.ServiceRequest) (
ContainerName
:
container
.
Name
,
MemoryLimit
:
container
.
Resources
.
Limits
.
Memory
()
.
Value
(),
}
logrus
.
Debugf
(
"container name: %s; memory limit: %d"
,
container
.
Name
,
containers
[
container
.
Name
]
.
MemoryLimit
)
}
Pods
=
append
(
Pods
,
&
pb
.
ServiceAppPod
{
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help