Create namespace for non-critical healthstate

Sunanda Roy · Juston Li · commit 2fe2b59fbb97 · 2018-01-31T10:56:28.000-08:00
Signed-off-by: Roy, Sunanda &lt;sunanda.roy@intel.com&gt;
diff --git a/src/lib/pool.c b/src/lib/pool.c
@@ -577,7 +577,8 @@ void add_dimm_to_pool(const struct pool_data *p_pool_data,
 		{
 			KEEP_POOL_HEALTH(p_pool->health, POOL_HEALTH_UNKNOWN);
 		}
-		else if (status.health != DEVICE_HEALTH_NORMAL ||
+		else if ((status.health != DEVICE_HEALTH_NORMAL &&
+				status.health != DEVICE_HEALTH_NONCRITICAL) ||
 				status.viral_state)
 		{
 			KEEP_POOL_HEALTH(p_pool->health, POOL_HEALTH_ERROR);
@@ -682,8 +683,8 @@ void nvm_interleave_to_interleave(
 					{
 						KEEP_INTERLEAVE_HEALTH(p_iset->health, INTERLEAVE_HEALTH_FAILED)
 					}
-					else if (p_pool_data->dimm_status_list[data_idx].health !=
-							DEVICE_HEALTH_NORMAL)
+					else if ((p_pool_data->dimm_status_list[data_idx].health != DEVICE_HEALTH_NORMAL) &&
+								(p_pool_data->dimm_status_list[data_idx].health != DEVICE_HEALTH_NONCRITICAL))
 					{
 						KEEP_INTERLEAVE_HEALTH(p_iset->health, INTERLEAVE_HEALTH_DEGRADED)
 					}

Original file line number	Diff line number	Diff line change
`@@ -577,7 +577,8 @@ void add_dimm_to_pool(const struct pool_data *p_pool_data,`
`577`	`577`	`{`
`578`	`578`	`KEEP_POOL_HEALTH(p_pool->health, POOL_HEALTH_UNKNOWN);`
`579`	`579`	`}`
`580`		`- else if (status.health != DEVICE_HEALTH_NORMAL \|\|`
	`580`	`+ else if ((status.health != DEVICE_HEALTH_NORMAL &&`
	`581`	`+ status.health != DEVICE_HEALTH_NONCRITICAL) \|\|`
`581`	`582`	`status.viral_state)`
`582`	`583`	`{`
`583`	`584`	`KEEP_POOL_HEALTH(p_pool->health, POOL_HEALTH_ERROR);`
`@@ -682,8 +683,8 @@ void nvm_interleave_to_interleave(`
`682`	`683`	`{`
`683`	`684`	`KEEP_INTERLEAVE_HEALTH(p_iset->health, INTERLEAVE_HEALTH_FAILED)`
`684`	`685`	`}`
`685`		`- else if (p_pool_data->dimm_status_list[data_idx].health !=`
`686`		`- DEVICE_HEALTH_NORMAL)`
	`686`	`+ else if ((p_pool_data->dimm_status_list[data_idx].health != DEVICE_HEALTH_NORMAL) &&`
	`687`	`+ (p_pool_data->dimm_status_list[data_idx].health != DEVICE_HEALTH_NONCRITICAL))`
`687`	`688`	`{`
`688`	`689`	`KEEP_INTERLEAVE_HEALTH(p_iset->health, INTERLEAVE_HEALTH_DEGRADED)`
`689`	`690`	`}`