From 8843782bbeb62c36a3be930f78fdf2d58222dfe2 Mon Sep 17 00:00:00 2001 From: eitan Date: Mon, 17 Oct 2005 06:23:58 +0000 Subject: [PATCH] updated service lease period from 1 to 4 seconds to avoid service flow failures on minimal time. git-svn-id: svn://openib.tc.cornell.edu/gen1@120 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- .../ulp/opensm/user/libvendor/osm_vendor_al.c | 2 +- trunk/ulp/opensm/user/osmtest/osmt_service.c | 20 +++++++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/trunk/ulp/opensm/user/libvendor/osm_vendor_al.c b/trunk/ulp/opensm/user/libvendor/osm_vendor_al.c index 2607d5be..519ed9a0 100644 --- a/trunk/ulp/opensm/user/libvendor/osm_vendor_al.c +++ b/trunk/ulp/opensm/user/libvendor/osm_vendor_al.c @@ -385,7 +385,7 @@ __osm_al_rcv_callback( allocated. */ osm_log( p_vend->p_log, OSM_LOG_DEBUG, - "__osm_al_rcv_callback: " + "__osm_al_rcv_callback: " "The Mad is a response , thus handeled in __osm_al_send_callback\n"); CL_ASSERT( p_elem->send_context1 != NULL ); CL_ASSERT( p_elem->send_context2 == NULL ); diff --git a/trunk/ulp/opensm/user/osmtest/osmt_service.c b/trunk/ulp/opensm/user/osmtest/osmt_service.c index 1c4a3f14..d82e5fa1 100644 --- a/trunk/ulp/opensm/user/osmtest/osmt_service.c +++ b/trunk/ulp/opensm/user/osmtest/osmt_service.c @@ -1278,7 +1278,11 @@ osmt_run_service_records_flow( IN osmtest_t * const p_osmt ) { p_osmt , cl_ntoh64(id[1]), /* IN ib_net64_t service_id, */ IB_DEFAULT_PKEY,/* IN ib_net16_t service_pkey, */ - cl_hton32(0x00000001), /* IN ib_net32_t service_lease, */ +<<<<<<< .mine + cl_hton32(0x00000005), /* IN ib_net32_t service_lease, */ +======= + cl_hton32(0x00000004), /* IN ib_net32_t service_lease, */ +>>>>>>> .r614 11, /* IN uint8_t service_key_lsb, */ (char*)service_name[1] /* IN char *service_name */ ); @@ -1364,7 +1368,9 @@ osmt_run_service_records_flow( IN osmtest_t * const p_osmt ) { /* Let OpenSM handle it */ usleep(100); - + + osm_log( &p_osmt->log, OSM_LOG_ERROR, + "osmt_run_service_records_flow: Get 1\n"); status = osmt_get_service_by_name(p_osmt, (char*)service_name[0],1, &srv_rec); if (status != IB_SUCCESS) @@ -1372,6 +1378,8 @@ osmt_run_service_records_flow( IN osmtest_t * const p_osmt ) { goto Exit; } + osm_log( &p_osmt->log, OSM_LOG_ERROR, + "osmt_run_service_records_flow: Get 2\n"); status = osmt_get_service_by_name(p_osmt, (char*)service_name[1],1, &srv_rec); if (status != IB_SUCCESS) @@ -1379,6 +1387,8 @@ osmt_run_service_records_flow( IN osmtest_t * const p_osmt ) { goto Exit; } + osm_log( &p_osmt->log, OSM_LOG_ERROR, + "osmt_run_service_records_flow: Get 3\n"); status = osmt_get_service_by_name(p_osmt, (char*)service_name[2],1, &srv_rec); if (status != IB_SUCCESS) @@ -1387,6 +1397,8 @@ osmt_run_service_records_flow( IN osmtest_t * const p_osmt ) { } /* Try to get osmt.srvc.4 b4 (there should be 1 records ) and after 10 sec - It should be deleted */ + osm_log( &p_osmt->log, OSM_LOG_ERROR, + "osmt_run_service_records_flow: Get 4\n"); status = osmt_get_service_by_name(p_osmt, (char*)service_name[3],1, &srv_rec); if (status != IB_SUCCESS) @@ -1394,6 +1406,8 @@ osmt_run_service_records_flow( IN osmtest_t * const p_osmt ) { goto Exit; } sleep(10); + osm_log( &p_osmt->log, OSM_LOG_ERROR, + "osmt_run_service_records_flow: Get 5\n"); status = osmt_get_service_by_name(p_osmt, (char*)service_name[3],0, &srv_rec); if (status == IB_SUCCESS) @@ -1401,6 +1415,8 @@ osmt_run_service_records_flow( IN osmtest_t * const p_osmt ) { goto Exit; } /* Check that for the current Service ID only one record exists */ + osm_log( &p_osmt->log, OSM_LOG_ERROR, + "osmt_run_service_records_flow: Get 6\n"); status = osmt_get_service_by_id(p_osmt, 1, cl_ntoh64(id[5]),&srv_rec); if (status != IB_SUCCESS) { -- 2.41.0