Merge branch 'master' into LH6266_server_should_return_404_for_backin…

…g_and_backup_resource

controller/backup_controller.go

@@ -636,7 +636,17 @@ func (bc *BackupController) checkMonitor(backup *longhorn.Backup, volume *longho
 	if kubernetesStatus.PVCName != "" && kubernetesStatus.LastPVCRefAt == "" {
 		pvc, _ := bc.ds.GetPersistentVolumeClaim(kubernetesStatus.Namespace, kubernetesStatus.PVCName)
 		if pvc != nil {
-			storageClassName = *pvc.Spec.StorageClassName
+			if pvc.Spec.StorageClassName != nil {
+				storageClassName = *pvc.Spec.StorageClassName
+			}
+			if storageClassName == "" {
+				if v, exist := pvc.Annotations[corev1.BetaStorageClassAnnotation]; exist {
+					storageClassName = v
+				}
+			}
+			if storageClassName == "" {
+				bc.logger.Warnf("Failed to find the StorageClassName from the pvc %v", pvc.Name)
+			}
 		}
 	}
 

controller/volume_controller.go

@@ -3647,7 +3647,8 @@ func (c *VolumeController) syncPVCRecurringJobLabels(volume *longhorn.Volume) er
 	}
 
 	if !hasSourceLabel {
-		c.logger.Warnf("Ignoring recurring job labels on Volume %v PVC %v due to missing source label", volume.Name, pvc.Name)
+		c.logger.Debugf("Ignoring recurring job labels on Volume %v PVC %v due to missing source label", volume.Name, pvc.Name)
+
 		return nil
 	}
 

engineapi/instance_manager.go

@@ -65,7 +65,7 @@ func (c *InstanceManagerClient) Close() error {
 	}
 
 	if c.diskServiceGrpcClient != nil {
-		err = multierr.Append(err, c.instanceServiceGrpcClient.Close())
+		err = multierr.Append(err, c.diskServiceGrpcClient.Close())
 	}
 
 	if c.instanceServiceGrpcClient != nil {

types/setting.go

@@ -1064,7 +1064,7 @@ var (
 		Type:        SettingTypeString,
 		Required:    true,
 		ReadOnly:    false,
-		Default:     "Debug",
+		Default:     "Info",
 	}
 
 	SettingDefinitionOfflineReplicaRebuilding = SettingDefinition{