Skip to content

Commit 5f13ffb

Browse files
author
seanchann
committed
fix User traffic synchronization time
1 parent 14b7d0d commit 5f13ffb

File tree

1 file changed

+18
-6
lines changed

1 file changed

+18
-6
lines changed

pkg/multiuser/helper.go

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,14 @@ func (mu *MultiUser) refreshNode(loopcnt int64) {
5959
return
6060
}
6161

62-
upload, download, usercnt, err := mu.CollectorAndUpdateUserTraffic()
62+
syncUserTraffic := false
63+
64+
if loopcnt%10 == 0 {
65+
glog.V(5).Infof("need sync user traffic to manager \r\n")
66+
syncUserTraffic = true
67+
}
68+
69+
upload, download, usercnt, err := mu.CollectorAndUpdateUserTraffic(syncUserTraffic)
6370
if err == nil {
6471
node.Spec.Server.Upload = upload
6572
node.Spec.Server.Download = download
@@ -79,7 +86,7 @@ func (mu *MultiUser) refreshNode(loopcnt int64) {
7986
}
8087
}
8188

82-
func (mu *MultiUser) CollectorAndUpdateUserTraffic() (int64, int64, int64, error) {
89+
func (mu *MultiUser) CollectorAndUpdateUserTraffic(sync bool) (int64, int64, int64, error) {
8390

8491
//userList := mu.userHandle.GetUsers()
8592
userList := mu.userHandle.GetUsersInfo()
@@ -118,10 +125,15 @@ func (mu *MultiUser) CollectorAndUpdateUserTraffic() (int64, int64, int64, error
118125
nodeUser.Annotations = make(map[string]string)
119126
nodeUser.Annotations[api.UserFakeAnnotationLastActiveTime] = userInfo.LastActiveTime.String()
120127

121-
err := UpdateNodeUserFromNode(nodeUser.Spec)
122-
if err != nil {
123-
glog.Errorf("update node user %+v err %v \r\n", nodeUser, err)
124-
} else {
128+
var err error
129+
if sync {
130+
err = UpdateNodeUserFromNode(nodeUser.Spec)
131+
if err != nil {
132+
glog.Errorf("update node user %+v err %v \r\n", nodeUser, err)
133+
}
134+
}
135+
136+
if err == nil {
125137
upload += nodeUser.Spec.User.UploadTraffic
126138
download += nodeUser.Spec.User.DownloadTraffic
127139
}

0 commit comments

Comments
 (0)