Skip to content

Commit 02ccc97

Browse files
authored
rem stale code (#506)
* rem stale code * fixes * reduce wait time * fix test 1 * fix test 2
1 parent 9d3cb97 commit 02ccc97

File tree

16 files changed

+60
-1667
lines changed

16 files changed

+60
-1667
lines changed

pkg/client/informers/controller-externalversion/generic.go

-5
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,6 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource
7171
resource: resource.GroupResource(),
7272
informer: f.SchedulingSpec().SchedulingSpecs().Informer(),
7373
}, nil
74-
case arbv1.SchemeGroupVersion.WithResource("queuejobs"):
75-
return &genericInformer{
76-
resource: resource.GroupResource(),
77-
informer: f.QueueJob().QueueJobs().Informer(),
78-
}, nil
7974
case arbv1.SchemeGroupVersion.WithResource("appwrappers"):
8075
return &genericInformer{
8176
resource: resource.GroupResource(),

pkg/client/informers/controller-externalversion/v1/interface.go

+3-11
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,13 @@ import (
3737
// Interface provides access to all the informers in this group version.
3838
type Interface interface {
3939
// SchedulingSpecs returns a SchedulingSpecInformer.
40-
SchedulingSpecs() SchedulingSpecInformer
41-
// QueueJobs returns a QueueJobInformer.
42-
QueueJobs() QueueJobInformer
40+
SchedulingSpecs() SchedulingSpecInformer
4341
// AppWrappers returns a QueueJobInformer.
44-
AppWrappers() AppWrapperInformer
42+
AppWrappers() AppWrapperInformer
4543
}
4644

47-
4845
type version struct {
49-
factory internalinterfaces.SharedInformerFactory
46+
factory internalinterfaces.SharedInformerFactory
5047
tweakListOptions internalinterfaces.TweakListOptionsFunc
5148
}
5249

@@ -60,11 +57,6 @@ func (v *version) SchedulingSpecs() SchedulingSpecInformer {
6057
return &schedulingSpecInformer{factory: v.factory, tweakListOptions: v.tweakListOptions}
6158
}
6259

63-
// QueueJobs returns a QueueJobInformer.
64-
func (v *version) QueueJobs() QueueJobInformer {
65-
return &queueJobInformer{factory: v.factory, tweakListOptions: v.tweakListOptions}
66-
}
67-
6860
func (v *version) AppWrappers() AppWrapperInformer {
6961
return &appWrapperInformer{factory: v.factory, tweakListOptions: v.tweakListOptions}
7062
}

pkg/client/informers/controller-externalversion/v1/queuejob.go

-86
This file was deleted.

pkg/client/listers/controller/v1/queuejob.go

-105
This file was deleted.

pkg/controller/clusterstate/api/cluster_info.go

-39
Original file line numberDiff line numberDiff line change
@@ -30,46 +30,7 @@ limitations under the License.
3030
*/
3131
package api
3232

33-
import "fmt"
34-
3533
// ClusterInfo is a snapshot of cluster by cache.
3634
type ClusterInfo struct {
37-
Jobs []*JobInfo
38-
3935
Nodes []*NodeInfo
4036
}
41-
42-
func (ci ClusterInfo) String() string {
43-
44-
str := "Cache:\n"
45-
46-
if len(ci.Nodes) != 0 {
47-
str = str + "Nodes:\n"
48-
for _, n := range ci.Nodes {
49-
str = str + fmt.Sprintf("\t %s: idle(%v) used(%v) allocatable(%v) pods(%d)\n",
50-
n.Name, n.Idle, n.Used, n.Allocatable, len(n.Tasks))
51-
52-
i := 0
53-
for _, p := range n.Tasks {
54-
str = str + fmt.Sprintf("\t\t %d: %v\n", i, p)
55-
i++
56-
}
57-
}
58-
}
59-
60-
if len(ci.Jobs) != 0 {
61-
str = str + "Jobs:\n"
62-
for _, job := range ci.Jobs {
63-
str = str + fmt.Sprintf("\t Job(%s) name(%s) minAvailable(%v)\n",
64-
job.UID, job.Name, job.MinAvailable)
65-
66-
i := 0
67-
for _, task := range job.Tasks {
68-
str = str + fmt.Sprintf("\t\t %d: %v\n", i, task)
69-
i++
70-
}
71-
}
72-
}
73-
74-
return str
75-
}

pkg/controller/clusterstate/api/helpers.go

-24
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,8 @@ import (
3434
"fmt"
3535

3636
v1 "k8s.io/api/core/v1"
37-
clientcache "k8s.io/client-go/tools/cache"
38-
"k8s.io/klog/v2"
3937
)
4038

41-
// PodKey returns the string key of a pod.
42-
func PodKey(pod *v1.Pod) TaskID {
43-
if key, err := clientcache.MetaNamespaceKeyFunc(pod); err != nil {
44-
return TaskID(fmt.Sprintf("%v/%v", pod.Namespace, pod.Name))
45-
} else {
46-
return TaskID(key)
47-
}
48-
}
49-
5039
func getTaskStatus(pod *v1.Pod) TaskStatus {
5140
switch pod.Status.Phase {
5241
case v1.PodRunning:
@@ -111,19 +100,6 @@ func MergeErrors(errs ...error) error {
111100
return nil
112101
}
113102

114-
// JobTerminated checkes whether job was terminated.
115-
func JobTerminated(job *JobInfo) bool {
116-
if job.SchedSpec == nil && len(job.Tasks) == 0 {
117-
klog.V(9).Infof("Job: %v is terminated.", job.UID)
118-
return true
119-
} else {
120-
klog.V(10).Infof("Job: %v not terminated, scheduleSpec: %v, tasks: %v.",
121-
job.UID, job.SchedSpec, job.Tasks)
122-
return false
123-
}
124-
125-
}
126-
127103
func NewStringsMap(source map[string]string) map[string]string {
128104
target := make(map[string]string)
129105

0 commit comments

Comments
 (0)