@@ -40,17 +40,17 @@ type stateCheckpoint struct {
4040 lastChecksum checksum.Checksum
4141}
4242
43- // NewStateCheckpoint creates new State for keeping track of pod resource allocations with checkpoint backend
43+ // NewStateCheckpoint creates new State for keeping track of pod resource information with checkpoint backend
4444func NewStateCheckpoint (stateDir , checkpointName string ) (State , error ) {
4545 checkpointManager , err := checkpointmanager .NewCheckpointManager (stateDir )
4646 if err != nil {
47- return nil , fmt .Errorf ("failed to initialize checkpoint manager for pod allocation tracking: %v " , err )
47+ return nil , fmt .Errorf ("failed to initialize checkpoint manager for pod resource information tracking: %w " , err )
4848 }
4949
5050 pra , checksum , err := restoreState (checkpointManager , checkpointName )
5151 if err != nil {
5252 //lint:ignore ST1005 user-facing error message
53- return nil , fmt .Errorf ("could not restore state from checkpoint: %w, please drain this node and delete pod allocation checkpoint file %q before restarting Kubelet" ,
53+ return nil , fmt .Errorf ("could not restore state from checkpoint: %w, please drain this node and delete pod resource information checkpoint file %q before restarting Kubelet" ,
5454 err , path .Join (stateDir , checkpointName ))
5555 }
5656
@@ -64,7 +64,7 @@ func NewStateCheckpoint(stateDir, checkpointName string) (State, error) {
6464}
6565
6666// restores state from a checkpoint and creates it if it doesn't exist
67- func restoreState (checkpointManager checkpointmanager.CheckpointManager , checkpointName string ) (PodResourceAllocation , checksum.Checksum , error ) {
67+ func restoreState (checkpointManager checkpointmanager.CheckpointManager , checkpointName string ) (PodResourceInfoMap , checksum.Checksum , error ) {
6868 checkpoint := & Checkpoint {}
6969 if err := checkpointManager .GetCheckpoint (checkpointName , checkpoint ); err != nil {
7070 if err == errors .ErrCheckpointNotFound {
@@ -73,21 +73,21 @@ func restoreState(checkpointManager checkpointmanager.CheckpointManager, checkpo
7373 return nil , 0 , err
7474 }
7575
76- praInfo , err := checkpoint .GetPodResourceAllocationInfo ()
76+ praInfo , err := checkpoint .GetPodResourceCheckpointInfo ()
7777 if err != nil {
78- return nil , 0 , fmt .Errorf ("failed to get pod resource allocation info : %w" , err )
78+ return nil , 0 , fmt .Errorf ("failed to get pod resource information : %w" , err )
7979 }
8080
81- klog .V (2 ).InfoS ("State checkpoint: restored pod resource allocation state from checkpoint" )
82- return praInfo .AllocationEntries , checkpoint .Checksum , nil
81+ klog .V (2 ).InfoS ("State checkpoint: restored pod resource state from checkpoint" )
82+ return praInfo .Entries , checkpoint .Checksum , nil
8383}
8484
8585// saves state to a checkpoint, caller is responsible for locking
8686func (sc * stateCheckpoint ) storeState () error {
87- podAllocation := sc .cache .GetPodResourceAllocation ()
87+ resourceInfo := sc .cache .GetPodResourceInfoMap ()
8888
89- checkpoint , err := NewCheckpoint (& PodResourceAllocationInfo {
90- AllocationEntries : podAllocation ,
89+ checkpoint , err := NewCheckpoint (& PodResourceCheckpointInfo {
90+ Entries : resourceInfo ,
9191 })
9292 if err != nil {
9393 return fmt .Errorf ("failed to create checkpoint: %w" , err )
@@ -98,47 +98,50 @@ func (sc *stateCheckpoint) storeState() error {
9898 }
9999 err = sc .checkpointManager .CreateCheckpoint (sc .checkpointName , checkpoint )
100100 if err != nil {
101- klog .ErrorS (err , "Failed to save pod allocation checkpoint" )
101+ klog .ErrorS (err , "Failed to save pod resource information checkpoint" )
102102 return err
103103 }
104104 sc .lastChecksum = checkpoint .Checksum
105105 return nil
106106}
107107
108- // GetContainerResourceAllocation returns current resources allocated to a pod's container
109- func (sc * stateCheckpoint ) GetContainerResourceAllocation (podUID types.UID , containerName string ) (v1.ResourceRequirements , bool ) {
108+ // GetContainerResources returns current resources information to a pod's container
109+ func (sc * stateCheckpoint ) GetContainerResources (podUID types.UID , containerName string ) (v1.ResourceRequirements , bool ) {
110110 sc .mux .RLock ()
111111 defer sc .mux .RUnlock ()
112- return sc .cache .GetContainerResourceAllocation (podUID , containerName )
112+ return sc .cache .GetContainerResources (podUID , containerName )
113113}
114114
115- // GetPodResourceAllocation returns current pod resource allocation
116- func (sc * stateCheckpoint ) GetPodResourceAllocation () PodResourceAllocation {
115+ // GetPodResourceInfoMap returns current pod resource information
116+ func (sc * stateCheckpoint ) GetPodResourceInfoMap () PodResourceInfoMap {
117117 sc .mux .RLock ()
118118 defer sc .mux .RUnlock ()
119- return sc .cache .GetPodResourceAllocation ()
119+ return sc .cache .GetPodResourceInfoMap ()
120120}
121121
122- // SetContainerResourceAllocation sets resources allocated to a pod's container
123- func (sc * stateCheckpoint ) SetContainerResourceAllocation (podUID types.UID , containerName string , alloc v1.ResourceRequirements ) error {
122+ // SetContainerResoruces sets resources information for a pod's container
123+ func (sc * stateCheckpoint ) SetContainerResources (podUID types.UID , containerName string , resources v1.ResourceRequirements ) error {
124124 sc .mux .Lock ()
125125 defer sc .mux .Unlock ()
126- sc .cache .SetContainerResourceAllocation (podUID , containerName , alloc )
126+ err := sc .cache .SetContainerResources (podUID , containerName , resources )
127+ if err != nil {
128+ return err
129+ }
127130 return sc .storeState ()
128131}
129132
130- // SetPodResourceAllocation sets pod resource allocation
131- func (sc * stateCheckpoint ) SetPodResourceAllocation (podUID types.UID , alloc map [ string ]v1. ResourceRequirements ) error {
133+ // SetPodResourceInfo sets pod resource information
134+ func (sc * stateCheckpoint ) SetPodResourceInfo (podUID types.UID , resourceInfo PodResourceInfo ) error {
132135 sc .mux .Lock ()
133136 defer sc .mux .Unlock ()
134- err := sc .cache .SetPodResourceAllocation (podUID , alloc )
137+ err := sc .cache .SetPodResourceInfo (podUID , resourceInfo )
135138 if err != nil {
136139 return err
137140 }
138141 return sc .storeState ()
139142}
140143
141- // Delete deletes allocations for specified pod
144+ // Delete deletes resource information for specified pod
142145func (sc * stateCheckpoint ) RemovePod (podUID types.UID ) error {
143146 sc .mux .Lock ()
144147 defer sc .mux .Unlock ()
@@ -161,19 +164,19 @@ func NewNoopStateCheckpoint() State {
161164 return & noopStateCheckpoint {}
162165}
163166
164- func (sc * noopStateCheckpoint ) GetContainerResourceAllocation (_ types.UID , _ string ) (v1.ResourceRequirements , bool ) {
167+ func (sc * noopStateCheckpoint ) GetContainerResources (_ types.UID , _ string ) (v1.ResourceRequirements , bool ) {
165168 return v1.ResourceRequirements {}, false
166169}
167170
168- func (sc * noopStateCheckpoint ) GetPodResourceAllocation () PodResourceAllocation {
171+ func (sc * noopStateCheckpoint ) GetPodResourceInfoMap () PodResourceInfoMap {
169172 return nil
170173}
171174
172- func (sc * noopStateCheckpoint ) SetContainerResourceAllocation (_ types.UID , _ string , _ v1.ResourceRequirements ) error {
175+ func (sc * noopStateCheckpoint ) SetContainerResources (_ types.UID , _ string , _ v1.ResourceRequirements ) error {
173176 return nil
174177}
175178
176- func (sc * noopStateCheckpoint ) SetPodResourceAllocation (_ types.UID , _ map [ string ]v1. ResourceRequirements ) error {
179+ func (sc * noopStateCheckpoint ) SetPodResourceInfo (_ types.UID , _ PodResourceInfo ) error {
177180 return nil
178181}
179182
0 commit comments