From bb281e494ffdaffaa93a6cc1a5d1c203674e82c4 Mon Sep 17 00:00:00 2001
From: Irena Rindos <irenarindos@users.noreply.github.com>
Date: Thu, 12 Jan 2023 12:02:08 -0500
Subject: [PATCH] Fix status NPE if worker has been sitting waiting for
 registration (#2781)

---
 internal/daemon/worker/status.go | 34 +++++++++++++++++---------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/internal/daemon/worker/status.go b/internal/daemon/worker/status.go
index cc0ac52225..e3dc26e1c0 100644
--- a/internal/daemon/worker/status.go
+++ b/internal/daemon/worker/status.go
@@ -211,25 +211,27 @@ func (w *Worker) sendWorkerStatus(cancelCtx context.Context, sessionManager sess
 			// append initial upstreams/ cluster addr to the resolver to try
 			if w.GrpcClientConn.GetState() == connectivity.TransientFailure {
 				lastStatus := w.lastStatusSuccess.Load().(*LastStatusInformation)
-				addrs := lastStatus.LastCalculatedUpstreams
+				if lastStatus != nil && lastStatus.LastCalculatedUpstreams != nil {
+					addrs := lastStatus.LastCalculatedUpstreams
 
-				if len(w.conf.RawConfig.Worker.InitialUpstreams) > 0 {
-					addrs = append(addrs, w.conf.RawConfig.Worker.InitialUpstreams...)
-				}
-				if len(w.conf.RawConfig.HcpbClusterId) > 0 {
-					clusterAddress := fmt.Sprintf("%s%s", w.conf.RawConfig.HcpbClusterId, hcpbUrlSuffix)
-					addrs = append(addrs, clusterAddress)
-				}
+					if len(w.conf.RawConfig.Worker.InitialUpstreams) > 0 {
+						addrs = append(addrs, w.conf.RawConfig.Worker.InitialUpstreams...)
+					}
+					if len(w.conf.RawConfig.HcpbClusterId) > 0 {
+						clusterAddress := fmt.Sprintf("%s%s", w.conf.RawConfig.HcpbClusterId, hcpbUrlSuffix)
+						addrs = append(addrs, clusterAddress)
+					}
 
-				addrs = strutil.RemoveDuplicates(addrs, false)
-				if strutil.EquivalentSlices(lastStatus.LastCalculatedUpstreams, addrs) {
-					// Nothing to update
-					return
-				}
+					addrs = strutil.RemoveDuplicates(addrs, false)
+					if strutil.EquivalentSlices(lastStatus.LastCalculatedUpstreams, addrs) {
+						// Nothing to update
+						return
+					}
 
-				w.updateAddresses(cancelCtx, addrs, addressReceivers)
-				lastStatus.LastCalculatedUpstreams = addrs
-				w.lastStatusSuccess.Store(lastStatus)
+					w.updateAddresses(cancelCtx, addrs, addressReceivers)
+					lastStatus.LastCalculatedUpstreams = addrs
+					w.lastStatusSuccess.Store(lastStatus)
+				}
 			}
 
 			// Exit out of status function; our work here is done and we don't need to create closeConnection requests