Andrew Bogott has submitted this change and it was merged.
Change subject: toolschecker: read/write test for labsdb1004
......................................................................
toolschecker: read/write test for labsdb1004
Bug: T107449
Bug: T97748
Change-Id: I9c2e5a2375c12542d4f17cd9ae05c6b754921196
---
M modules/toollabs/files/toolschecker.py
1 file changed, 30 insertions(+), 6 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/toollabs/files/toolschecker.py
b/modules/toollabs/files/toolschecker.py
index f69a919..ea02a23 100644
--- a/modules/toollabs/files/toolschecker.py
+++ b/modules/toollabs/files/toolschecker.py
@@ -1,7 +1,9 @@
+import ConfigParser
import flask
import ldap
import ldapsupportlib
import os
+import psycopg2
import pymysql
import redis
import requests
@@ -129,11 +131,6 @@
return db_query_check('labsdb1003.eqiad.wmnet')
-@check('/labsdb/labsdb1004')
-def labsdb_check_labsdb1004():
- return db_query_check('labsdb1004.eqiad.wmnet')
-
-
@check('/labsdb/labsdb1005')
def labsdb_check_labsdb1005():
connection = pymysql.connect('labsdb1005.eqiad.wmnet',
read_default_file=os.path.expanduser('~/replica.my.cnf'))
@@ -228,7 +225,34 @@
cur.execute("SELECT * FROM test WHERE test=%s" % magicnumber)
result = cur.fetchone()
if result:
- cur.execute('DELETE FROM test WHERE test=%s;', magicnumber)
+ cur.execute('DELETE FROM test WHERE test=%s' % magicnumber)
+ connection.commit()
+ success = True
+ finally:
+ cur.close()
+ connection.close()
+ return success
+
+
+@check('/labsdb/labsdb1004rw')
+def postgres_read_write_check():
+ dbconfig = ConfigParser.RawConfigParser()
+ dbconfig.read(os.path.expanduser('~/postgres.my.cnf'))
+ user = dbconfig.get('client', 'user')
+ password = dbconfig.get('client', 'password')
+ magicnumber = int(time.time())
+
+ try:
+ connection = psycopg2.connect(
+ "host=labsdb1004.eqiad.wmnet dbname=%s_rwtest user=%s password=%s"
%
+ (user, user, password))
+ cur = connection.cursor()
+ cur.execute("INSERT INTO test (test) VALUES (%s)" % magicnumber)
+ connection.commit()
+ cur.execute("SELECT * FROM test WHERE test=%s" % magicnumber)
+ result = cur.fetchone()
+ if result:
+ cur.execute('DELETE FROM test WHERE test=%s' % magicnumber)
connection.commit()
success = True
finally:
--
To view, visit https://gerrit.wikimedia.org/r/239183
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9c2e5a2375c12542d4f17cd9ae05c6b754921196
Gerrit-PatchSet: 16
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
