openhpi-svn Mailing List for Open HPI

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 7758
          http://sourceforge.net/p/openhpi/code/7758
Author:   dr_mohan
Date:     2018-03-09 01:43:41 +0000 (Fri, 09 Mar 2018)
Log Message:
-----------
Merge 3.8.x branch changes to trunk

Modified Paths:
--------------
    openhpi/trunk/ChangeLog
    openhpi/trunk/plugins/ov_rest/ov_rest.h
    openhpi/trunk/plugins/ov_rest/ov_rest_callsupport.c
    openhpi/trunk/plugins/ov_rest/ov_rest_discover.c

Property Changed:
----------------
    openhpi/trunk/

Index: openhpi/trunk
===================================================================

--- openhpi/trunk	2018-03-08 19:24:57 UTC (rev 7757)
+++ openhpi/trunk	2018-03-09 01:43:41 UTC (rev 7758)

Property changes on: openhpi/trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/openhpi/branches/3.8.x:7743-7747
\ No newline at end of property
+/openhpi/branches/3.8.x:7743-7747,7750-7757
\ No newline at end of property
Modified: openhpi/trunk/ChangeLog
===================================================================
--- openhpi/trunk/ChangeLog	2018-03-08 19:24:57 UTC (rev 7757)
+++ openhpi/trunk/ChangeLog	2018-03-09 01:43:41 UTC (rev 7758)
@@ -1,3 +1,112 @@
+Changelog for 3.8.0 (03/01/2018)
+
+  New Features
+
+  Fixed Bugs
+
+   Build System
+
+       1995 - make distcheck fails
+
+       1978 - Compile fails on glib<2.32 version
+
+       1976 - Configure error when json-c-devel not included
+
+       1974 - Remove the warnings from build
+
+       1968 - Bring in build changes from debian build
+
+       1967 - SNMP build fails on debian
+
+   HP ProLiant plugin
+
+       1962 - ilo2_ribcl plugin fails to run against Gen10
+
+   HP c-Class Plugin
+
+       1996 - Segmentation fault in oa_soap plugin during resource inventory cleaning
+
+       1991 - Fix the infinite loop in soap_enum when the string length is 0
+
+       1960 - openhpid process is consuming more than 10G
+
+   HPE Synergy plugin
+
+       1999 - Handle the error code from Synergy composer
+
+       1990 - ov_rest cert path is not getting created
+
+       1987 - Alert fields reorder leads to segfault
+
+       1986 - Increase the X-Api-Version to 600
+
+       1985 - Fix compile error in ov_rest_discover.c
+
+       1984 - handle case DISCOVERY_FAILED in ov_rest_discover_resources
+
+       1983 - Appliance and Composer resources have few wrong Capabilities
+
+       1982 - Session id expires if no activity in a day
+
+       1979 - Do not add Rack Mount Server to Synergy Enclosure
+
+       1975 - Synergy blade added as rack mount server
+
+       1964 - Handle important composer events
+
+       1961 - CRIT messages seen on running openhpid.
+
+       1959 - Create one RPT per composer
+
+       1956 - SuSE12 compile warnings - return value not handled
+
+       1953 - URI field for Synergy composer is missing.
+
+       1951 - Warning messages see during make on SuSE 12
+
+       1950 - CRIT messages could be handled better
+
+       1946 - Handle task Reset for Interconnects.
+
+       1945 - Alerts and Tasks not registered
+
+       1943 - FirmwareMajorRev&FirmwareMinorRev is zero for Synergy Composer and Enclosure.
+
+       1942 - Manufacturer is missing for Synergy Fan Module and Power Supply.
+
+       1941 - Product version is null for Enclosures.
+
+       1937 - oem_event log file needs to be created afresh every time
+
+   HPI Clients
+
+       1994 - hpipower client gives wrong error message
+
+   HPI Shell
+
+       1920 - Remove useless addcfg command from hpi_shell
+
+   HPI Utils
+
+       1980 - Continue with message, if uid_map file creation fails
+
+   IPMI Direct plugin
+
+       1970 - Replace __STRING
+
+       1969 - Use PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP if libc defines it
+
+       1966 - Make the ipmi build to work with gcc-7
+
+   OpenHPI Daemon
+
+       1981 - Configure gives an error on RHEL65
+
+   OpenHPI base library
+
+       1977 - Coverity Scan detects several issues
+
+
 Changelog for 3.7.0 (05/26/2017)
 
   New Features

Modified: openhpi/trunk/plugins/ov_rest/ov_rest.h
===================================================================
--- openhpi/trunk/plugins/ov_rest/ov_rest.h	2018-03-08 19:24:57 UTC (rev 7757)
+++ openhpi/trunk/plugins/ov_rest/ov_rest.h	2018-03-09 01:43:41 UTC (rev 7758)
@@ -148,6 +148,7 @@
 	SaHpiInt32T max_current_enclosure_count;
 	SaHpiInt32T current_rms_count;
 	SaHpiInt32T max_current_rms_count;
+	SaHpiInt32T discover_called_count;
 	GHashTable *uri_rid;
 	struct cert {
 		char fCaRoot[15];

Modified: openhpi/trunk/plugins/ov_rest/ov_rest_callsupport.c
===================================================================
--- openhpi/trunk/plugins/ov_rest/ov_rest_callsupport.c	2018-03-08 19:24:57 UTC (rev 7757)
+++ openhpi/trunk/plugins/ov_rest/ov_rest_callsupport.c	2018-03-09 01:43:41 UTC (rev 7758)
@@ -300,6 +300,7 @@
 	struct ov_rest_handler *ov_handler =
 		(struct ov_rest_handler *) handler->data;
 
+	ov_handler->discover_called_count = 0;
 	con = (REST_CON *) ov_handler->connection;
 
 	/* Get the Active OV hostname/IP address and check whether it's NULL */

Modified: openhpi/trunk/plugins/ov_rest/ov_rest_discover.c
===================================================================
--- openhpi/trunk/plugins/ov_rest/ov_rest_discover.c	2018-03-08 19:24:57 UTC (rev 7757)
+++ openhpi/trunk/plugins/ov_rest/ov_rest_discover.c	2018-03-09 01:43:41 UTC (rev 7758)
@@ -1552,6 +1552,7 @@
 {
 	SaErrorT rv = SA_OK;
 	OV_STRING s = {0};
+	const char *ecode = NULL;
 	/* struct timeoutResponse response = {0}; */
 	/* json_object *timeoutResponse = NULL;  */
 	struct curl_slist *chunk = NULL;
@@ -1569,7 +1570,15 @@
 		ov_rest_prn_json_obj(key, val);
 		if(!strcmp(key,"idleTimeout")) 
 			to->timeout = json_object_get_int(val);
+		if(!strcmp(key,"errorCode"))
+			ecode = json_object_get_string(val);
 	}
+
+	if (ecode != NULL || to->timeout == 0) {
+		CRIT("Session error %s or timeout=%d", ecode, to->timeout);
+		rv = SA_ERR_HPI_INTERNAL_ERROR;
+	}
+
 	wrap_free(s.ptr);
 	ov_rest_wrap_json_object_put(s.jobj);
 	wrap_g_free(ov_handler->connection->url);
@@ -1614,6 +1623,7 @@
 	struct oh_handler_state *handler = NULL;
 	struct ov_rest_handler *ov_handler = NULL;
 	struct idleTimeout sess_timeout = {0};
+	static int mtl = 480; /* Max timeout loops 86400000/(1000*60*3) */
 
 	handler = (struct oh_handler_state *) oh_handler;
 	ov_handler = (struct ov_rest_handler *) handler->data;
@@ -1645,13 +1655,14 @@
 			}
 			break;
 		case DISCOVERY_FAIL:
-			err("Re-discovery, after failure, for OneView %s", 
+			err("Re-discovery, after failure, for Synergy %s", 
 				ov_handler->connection->hostname);
 			rv = ov_rest_connection_init(handler);
-			if(rv != SA_OK){
+			if(rv != SA_OK) {
 				err("Please check whether the Synergy "
 					"Composer %s is accessible",
 					ov_handler->connection->hostname);
+				wrap_g_mutex_unlock(ov_handler->mutex);
 				return rv;
 			}
 			rv = ov_rest_re_discover_resources(handler);
@@ -1669,15 +1680,29 @@
 			dbg("Discovery already done");
 			/* Call a function to keep the session alive */
 			rv = ov_rest_session_timeout(ov_handler,&sess_timeout);
-			if ( rv != SA_OK) {
-                                err("Session is Not Alive. No idleTimeout");
-                                ov_handler->status = DISCOVERY_FAIL;
+			if (( ov_handler->discover_called_count == 0 ) &&
+				( sess_timeout.timeout != 0 )) {
+				mtl = sess_timeout.timeout/(1000*60*3);
+				dbg("idleTimeout=%d and max loops=%d",
+					sess_timeout.timeout, mtl);
+			}
+			if (( rv == SA_OK ) &&
+				( ov_handler->discover_called_count < mtl-3 )) {
+				ov_handler->discover_called_count++;
                                 wrap_g_mutex_unlock(ov_handler->mutex);
                                 return rv;
                         }
-			dbg("Session Idle Timeout is %d", sess_timeout.timeout);
+			rv = ov_rest_connection_init(handler);
+			if(rv != SA_OK){
+				err("Please check whether the Synergy "
+					"Composer %s is accessible",
+					ov_handler->connection->hostname);
+				wrap_g_mutex_unlock(ov_handler->mutex);
+				return rv;
+			}
 			wrap_g_mutex_unlock(ov_handler->mutex);
-			return SA_OK;
+			return rv;
+
 		default:
 			err("Wrong ov_rest handler state %d detected",
                               ov_handler->status);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2006	Jan	Feb	Mar	Apr	May (70)	Jun (57)	Jul (72)	Aug (111)	Sep (59)	Oct (38)	Nov (65)	Dec (104)
2007	Jan (48)	Feb (27)	Mar (3)	Apr (4)	May (36)	Jun (21)	Jul (7)	Aug (25)	Sep (33)	Oct (24)	Nov (27)	Dec (19)
2008	Jan (26)	Feb (22)	Mar (66)	Apr (65)	May (28)	Jun (5)	Jul (26)	Aug (5)	Sep (6)	Oct (25)	Nov (17)	Dec (6)
2009	Jan (20)	Feb (20)	Mar (5)	Apr (31)	May (6)	Jun (4)	Jul	Aug (3)	Sep (2)	Oct (6)	Nov (8)	Dec (2)
2010	Jan (7)	Feb (6)	Mar (16)	Apr (10)	May (11)	Jun (37)	Jul (14)	Aug (5)	Sep (9)	Oct (10)	Nov (25)	Dec (55)
2011	Jan (29)	Feb (24)	Mar (6)	Apr (9)	May (16)	Jun (19)	Jul (4)	Aug (4)	Sep (15)	Oct (15)	Nov (8)	Dec (4)
2012	Jan (8)	Feb (1)	Mar (11)	Apr (16)	May (25)	Jun (28)	Jul (10)	Aug (25)	Sep (5)	Oct (5)	Nov (1)	Dec (1)
2013	Jan (1)	Feb	Mar (3)	Apr (2)	May (14)	Jun (3)	Jul (5)	Aug (4)	Sep (3)	Oct (4)	Nov (7)	Dec (4)
2014	Jan (1)	Feb (3)	Mar	Apr (2)	May	Jun (3)	Jul (5)	Aug (2)	Sep (10)	Oct (11)	Nov (2)	Dec (1)
2015	Jan (2)	Feb (2)	Mar (2)	Apr (4)	May (4)	Jun (6)	Jul (13)	Aug (12)	Sep (7)	Oct	Nov	Dec
2016	Jan	Feb	Mar	Apr (5)	May (1)	Jun	Jul	Aug (2)	Sep (3)	Oct	Nov	Dec
2017	Jan	Feb	Mar	Apr (16)	May (16)	Jun (6)	Jul (3)	Aug	Sep (1)	Oct (5)	Nov (1)	Dec (4)
2018	Jan (15)	Feb (6)	Mar (9)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

openhpi-svn Mailing List for Open HPI

openhpi-svn — All subversion commits will be tracked on this list.