Merge pull request #122 from rchac/setqueues

Allow operator to override number of queues / CPU cores utilized.

v1.2/LibreQoS.py

@@ -20,7 +20,7 @@ import binpacking
 
 from ispConfig import fqOrCAKE, upstreamBandwidthCapacityDownloadMbps, upstreamBandwidthCapacityUploadMbps, \
 	interfaceA, interfaceB, enableActualShellCommands, \
-	runShellCommandsAsSudo, generatedPNDownloadMbps, generatedPNUploadMbps, usingXDP
+	runShellCommandsAsSudo, generatedPNDownloadMbps, generatedPNUploadMbps, usingXDP, queuesAvailableOverride
 
 def shell(command):
 	if enableActualShellCommands:
@@ -78,6 +78,7 @@ def tearDown(interfaceA, interfaceB):
 def findQueuesAvailable():
 	# Find queues and CPU cores available. Use min between those two as queuesAvailable
 	if enableActualShellCommands:
+		if queuesAvailableOverride == 0:
 			queuesAvailable = 0
 			path = '/sys/class/net/' + interfaceA + '/queues/'
 			directory_contents = os.listdir(path)
@@ -85,6 +86,9 @@ def findQueuesAvailable():
 				if "tx-" in str(item):
 					queuesAvailable += 1
 			print("NIC queues:\t\t\t" + str(queuesAvailable))
+		else:
+			queuesAvailable = queuesAvailableOverride
+			print("NIC queues (Override):\t\t\t" + str(queuesAvailable))
 		cpuCount = multiprocessing.cpu_count()
 		print("CPU cores:\t\t\t" + str(cpuCount))
 		queuesAvailable = min(queuesAvailable,cpuCount)

v1.2/ispConfig.example.py

@@ -31,6 +31,9 @@ enableActualShellCommands = True
 # Add 'sudo' before execution of any shell commands. May be required depending on distribution and environment.
 runShellCommandsAsSudo = False
 
+# Allows overriding queues / CPU cores used. When set to 0, the max possible queues / CPU cores are utilized. Please leave as 0.
+queuesAvailableOverride = 0
+
 # Bandwidth Graphing
 bandwidthGraphingEnabled = True
 influxDBurl = "http://localhost:8086"