commit 08b0a89c56ada43f12003b5e99414c3719cd5e76
author Marri Devender Rao <devenrao@in.ibm.com> Wed Nov 08 03:38:27 2017 -0600
committer Andrew Jeffery <andrew@aj.id.au> Fri Nov 17 06:37:07 2017 +0000
tree d981b638259db08b55ac9ccead685c5478cb6353
parent 59ce099b7b59e86f2cc8ffedd3c97143dfccd33c

Fix up InternalFailure to include metadata

Scope is to add missing logs for InternalFailure errors

Resolves openbmc/openbmc#2552, openbmc/openbmc#2568

Change-Id: Ic94b9d768e32b4d7be2b9b6746c1b675f15e3b1e
Signed-off-by: Marri Devender Rao <devenrao@in.ibm.com>

pnor_partition.cpp

diff --git a/pnor_partition.cpp b/pnor_partition.cpp
index 1d5ca12..52a1275 100644
--- a/pnor_partition.cpp
+++ b/pnor_partition.cpp
@@ -64,6 +64,9 @@
     if (!partition)
     {
         MSG_ERR("Couldn't get the partition info for offset[0x%.8x]",offset);
+        log<level::ERR>("Request::getPartitionFilePath error in call to "
+                "vpnor_get_partition",
+                entry("OFFSET=%d", offset));
         elog<InternalFailure>();
     }
 
@@ -107,6 +110,11 @@
     // not interested in any other error except FILE_NOT_FOUND
     if (rc != ReturnCode::FILE_NOT_FOUND)
     {
+        log<level::ERR>("RORequest::getPartitionInfo error in opening "
+                "partition file",
+                entry("RC=%d", rc),
+                entry("FILE_NAME=%s", path.c_str()),
+                entry("OFFSET=%d", offset));
         elog<InternalFailure>();
     }
 
@@ -114,6 +122,11 @@
     if (partition->data.user.data[1] & PARTITION_READONLY)
     {
         MSG_ERR("Can't open the partition file");
+        log<level::ERR>("RORequest::getPartitionInfo error offset is "
+                "in read only partition",
+                entry("FILE_NAME=%s", path.c_str()),
+                entry("OFFSET=%d", offset),
+                entry("USER_DATA=%s", partition->data.user.data[1]));
         elog<InternalFailure>();
     }
 
@@ -126,6 +139,10 @@
     rc = Request::open(partitionFilePath, O_RDONLY);
     if (rc != ReturnCode::SUCCESS)
     {
+        log<level::ERR>("RORequest::getPartitionInfo error in opening "
+                "partition file from read only location",
+                entry("RC=%d", rc),
+                entry("FILE_NAME=%s", partitionFilePath.c_str()));
         elog<InternalFailure>();
     }
 
@@ -146,6 +163,11 @@
     // not interested in any other error except FILE_NOT_FOUND
     if (rc != ReturnCode::FILE_NOT_FOUND)
     {
+        log<level::ERR>("RWRequest::getPartitionInfo error in opening "
+                "partition file",
+                entry("RC=%d", rc),
+                entry("FILE_NAME=%s", path.c_str()),
+                entry("OFFSET=%d", offset));
         elog<InternalFailure>();
     }
 
@@ -158,6 +180,10 @@
     if (!fs::exists(fromPath))
     {
         MSG_ERR("Couldn't find the file[%s]",fromPath.c_str());
+        log<level::ERR>("RWRequest::getPartitionInfo error in opening "
+                "partition file from read only location",
+                entry("FILE_NAME=%s", fromPath.c_str()),
+                entry("OFFSET=%d", offset));
         elog<InternalFailure>();
     }
     //copy the file from ro to respective partition
@@ -183,6 +209,10 @@
 
     if (rc != ReturnCode::SUCCESS)
     {
+        log<level::ERR>("RWRequest::getPartitionInfo error in opening "
+                "partition file from read write location",
+                entry("RC=%d", rc),
+                entry("FILE_NAME=%s", toPath.c_str()));
         elog<InternalFailure>();
     }
 

pnor_partition_table.cpp

diff --git a/pnor_partition_table.cpp b/pnor_partition_table.cpp
index aa68750..3e3f1d1 100644
--- a/pnor_partition_table.cpp
+++ b/pnor_partition_table.cpp
@@ -238,6 +238,8 @@
     }
 
     MSG_ERR("Partition %s not found", name.c_str());
+    log<level::ERR>("Table::partition partition not found ",
+        entry("PARTITION_NAME=%s", name.c_str()));
     elog<InternalFailure>();
     static pnor_partition p{};
     return p;