rhbugzilla: Don't pull down attachments on refresh() (bz 1084887)

crobinso · crobinso · commit b3e9fb8feb3e · 2014-04-14T12:15:35.000-04:00
Attachments can be huge, and processing them hits the bugzilla server
quite hard. Coupled with the fact that it's easy for bugs to hit refresh(),
and users may inadvertently be contributing to bugzilla slowness.

Doing a 'print bug.attachments' will still pull down the attachment data,
it just isn't unconditionally fetched on bug.refresh() anymore.
diff --git a/bugzilla/base.py b/bugzilla/base.py
@@ -820,7 +820,8 @@ def _find_comps():
     getbug_extra_fields = []
 
 
-    def _getbugs(self, idlist, simple=False, permissive=True):
+    def _getbugs(self, idlist, simple=False, permissive=True,
+            extra_fields=None):
         '''
         Return a list of dicts of full bug info for each given bug id.
         bug ids that couldn't be found will return None instead of a dict.
@@ -840,7 +841,10 @@ def _getbugs(self, idlist, simple=False, permissive=True):
         if permissive:
             getbugdata["permissive"] = 1
         if self.getbug_extra_fields and not simple:
+            # This means bugzilla actually supports extra_fields
             getbugdata["extra_fields"] = self.getbug_extra_fields
+            if extra_fields:
+                getbugdata["extra_fields"] += extra_fields
 
         log.debug("Calling Bug.get_bugs with: %s", getbugdata)
         r = self._proxy.Bug.get_bugs(getbugdata)
@@ -866,9 +870,10 @@ def _getbugs(self, idlist, simple=False, permissive=True):
 
         return ret
 
-    def _getbug(self, objid, simple=False):
+    def _getbug(self, objid, simple=False, extra_fields=None):
         '''Return a dict of full bug info for the given bug id'''
-        return self._getbugs([objid], simple=simple, permissive=False)[0]
+        return self._getbugs([objid], simple=simple, permissive=False,
+            extra_fields=extra_fields)[0]
 
     def getbug(self, objid):
         '''Return a Bug object with the full complement of bug data
diff --git a/bugzilla/bug.py b/bugzilla/bug.py
@@ -91,7 +91,7 @@ def __getattr__(self, name):
 
             log.debug("Bug %i missing attribute '%s' - doing refresh()",
                       self.bug_id, name)
-            self.refresh()
+            self.refresh(fields=[name])
             refreshed = True
 
         raise AttributeError("Bug object has no attribute '%s'" % name)
@@ -110,9 +110,9 @@ def __setstate__(self, d):
         self._update_dict(d)
         self.bugzilla = None
 
-    def refresh(self):
+    def refresh(self, fields=None):
         '''Refresh all the data in this Bug.'''
-        r = self.bugzilla._getbug(self.bug_id)
+        r = self.bugzilla._getbug(self.bug_id, extra_fields=fields)
 
         self._update_dict(r)
 
diff --git a/bugzilla/rhbugzilla.py b/bugzilla/rhbugzilla.py
@@ -70,7 +70,7 @@ def _add_both_alias(newname, origname):
 
     getbug_extra_fields = (
         _parent.getbug_extra_fields + [
-            "attachments", "comments", "description",
+            "comments", "description",
             "external_bugs", "flags", "sub_components",
             "tags",
         ]

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ def _add_both_alias(newname, origname):`
`70`	`70`
`71`	`71`	`getbug_extra_fields = (`
`72`	`72`	`_parent.getbug_extra_fields + [`
`73`		`- "attachments", "comments", "description",`
	`73`	`+ "comments", "description",`
`74`	`74`	`"external_bugs", "flags", "sub_components",`
`75`	`75`	`"tags",`
`76`	`76`	`]`