[ogr provider] disable connection timeouts

nirvn · nirvn · commit be04eeb0e39d · 2018-08-15T15:20:50.000+07:00
diff --git a/src/providers/ogr/qgsogrfeatureiterator.cpp b/src/providers/ogr/qgsogrfeatureiterator.cpp
@@ -43,8 +43,11 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource *source, bool
   , mFilterFids( mRequest.filterFids() )
   , mFilterFidsIt( mFilterFids.constBegin() )
 {
+  // Since connection timeout for OGR connections is problematic and can lead to crashes, disable for now.
+  mRequest.setConnectionTimeout( -1 );
+
   //QgsDebugMsg( "Feature iterator of " + mSource->mLayerName + ": acquiring connection");
-  mConn = QgsOgrConnPool::instance()->acquireConnection( QgsOgrProviderUtils::connectionPoolId( mSource->mDataSource ), request.connectionTimeout(), request.requestMayBeNested() );
+  mConn = QgsOgrConnPool::instance()->acquireConnection( QgsOgrProviderUtils::connectionPoolId( mSource->mDataSource ), mRequest.connectionTimeout(), mRequest.requestMayBeNested() );
   if ( !mConn->ds )
   {
     return;

Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,11 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource *source, bool`
`43`	`43`	`, mFilterFids( mRequest.filterFids() )`
`44`	`44`	`, mFilterFidsIt( mFilterFids.constBegin() )`
`45`	`45`	`{`
	`46`	`+ // Since connection timeout for OGR connections is problematic and can lead to crashes, disable for now.`
	`47`	`+ mRequest.setConnectionTimeout( -1 );`
	`48`	`+`
`46`	`49`	`//QgsDebugMsg( "Feature iterator of " + mSource->mLayerName + ": acquiring connection");`
`47`		`- mConn = QgsOgrConnPool::instance()->acquireConnection( QgsOgrProviderUtils::connectionPoolId( mSource->mDataSource ), request.connectionTimeout(), request.requestMayBeNested() );`
	`50`	`+ mConn = QgsOgrConnPool::instance()->acquireConnection( QgsOgrProviderUtils::connectionPoolId( mSource->mDataSource ), mRequest.connectionTimeout(), mRequest.requestMayBeNested() );`
`48`	`51`	`if ( !mConn->ds )`
`49`	`52`	`{`
`50`	`53`	`return;`