Quantcast
Channel: Zenoss Community: Message List
Viewing all articles
Browse latest Browse all 1118

Core 4.2.4 Failed Zenup to SP174. Log has "Hunk # FAILED" errors

$
0
0

Core 4.2.4 on Centos6.4 64bit.  I believe I am experiencing the bug related to ZUP SP163 breaking the eventd processing.  Per the wiki, I have tried to upgrade to SP174.

I can complete every step up to the --dry-run test, where I see a variety of "Hunk #1 FAILED" (and #2, #3, #4, etc.) for a number of files.

 

zenup install /home/zenoss/zenoss_core-4.2.4-SP174.zup --dry-run

 

The log below is /opt/zenup/zenup.log

This is all the info that I know to look for at this point in time.

 

Any and all help/guidance is greatly appreciated.  Thank you

 

2013-11-18 19:11:57,831 DEBUG: Loaded product: zenoss-core-4.2.4

2013-11-18 19:11:57,832 DEBUG: Running CLI command: install /home/zenoss/zenoss_core-4.2.4-SP174.zup --dry-run

2013-11-18 19:11:58,413 DEBUG: Initializing environment (product=zenoss-core-4.2.4, zupfile=/home/zenoss/zenoss_core-4.2.4-SP174.zup)

2013-11-18 19:11:58,983 DEBUG: Checking archive compatibility with product: zenoss-core-4.2.4

2013-11-18 19:11:58,983 INFO : Running script: /tmp/zenoss-core-4.2.4_vg4qfS/new_zup/check

2013-11-18 19:11:58,990 DEBUG: OUTPUT: Checking environment...

2013-11-18 19:11:58,991 DEBUG: OUTPUT: Checking Zenoss installation...

2013-11-18 19:11:59,000 DEBUG: OUTPUT: Looking for patch utility...

2013-11-18 19:11:59,001 DEBUG: OUTPUT:

2013-11-18 19:11:59,001 DEBUG: OUTPUT: Looking for ZenPacks to update...

2013-11-18 19:11:59,050 DEBUG: OUTPUT:   will update to ZenPacks.zenoss.ApacheMonitor-2.1.4-py2.7.egg, installed=2.1.3 is older than RPS

2013-11-18 19:11:59,097 DEBUG: OUTPUT:   will update to ZenPacks.zenoss.MySqlMonitor-2.2.1-py2.7.egg, installed=2.2.0 is older than RPS

2013-11-18 19:11:59,142 DEBUG: OUTPUT:   will update to ZenPacks.zenoss.WindowsMonitor-1.1.0-py2.7.egg, installed=1.0.8 is older than RPS

2013-11-18 19:11:59,186 DEBUG: OUTPUT:   will update to ZenPacks.zenoss.ZenJMX-3.9.6-py2.7.egg, installed=3.9.5 is older than RPS

2013-11-18 19:11:59,186 DEBUG: OUTPUT: WARNING: 'zenoss stop' will be required to update ZenPacks

2013-11-18 19:11:59,187 DEBUG: OUTPUT:

2013-11-18 19:11:59,187 DEBUG: OUTPUT: Looking for new migrate scripts to load...

2013-11-18 19:12:00,144 DEBUG: OUTPUT: WARNING: 'zenoss stop' will be required to run zenmigrate:

2013-11-18 19:12:00,145 DEBUG: OUTPUT: Products/ZenModel/migrate/RemoveIgnoreParametersFromOsProcessClass.py

2013-11-18 19:12:00,145 DEBUG: OUTPUT: Products/ZenModel/migrate/addLockingToProcesses.py

2013-11-18 19:12:00,145 DEBUG: OUTPUT: Products/ZenModel/migrate/AddMissedRunsMonitorGraph.py

2013-11-18 19:12:00,145 DEBUG: OUTPUT: Products/ZenModel/migrate/fixMysqlPermissions.py

2013-11-18 19:12:00,146 DEBUG: OUTPUT: Products/ZenModel/migrate/changeFlappingSeverityType.py

2013-11-18 19:12:00,146 DEBUG: OUTPUT: Products/ZenModel/migrate/changeFlappingSeverityType.py

2013-11-18 19:12:00,146 DEBUG: OUTPUT: Products/ZenModel/migrate/addLockingToProcesses.py

2013-11-18 19:12:00,146 DEBUG: OUTPUT: Products/ZenModel/migrate/addMacAddressIndex.py

2013-11-18 19:12:00,146 DEBUG: OUTPUT: Products/ZenModel/migrate/eventsAppZenoss.py

2013-11-18 19:12:00,146 DEBUG: OUTPUT: Products/ZenModel/migrate/addMacAddressIndex.py

2013-11-18 19:12:00,146 DEBUG: OUTPUT: Products/ZenModel/migrate/RemoveIgnoreParametersFromOsProcessClass.py

2013-11-18 19:12:00,147 DEBUG: OUTPUT: Products/ZenModel/migrate/processCountThreshold.py

2013-11-18 19:12:00,147 DEBUG: OUTPUT:

2013-11-18 19:12:00,147 DEBUG: OUTPUT: Finished with prerequisite checks

2013-11-18 19:12:00,147 DEBUG: OUTPUT:

2013-11-18 19:12:07,925 DEBUG: Computing files affected by installing zup /home/zenoss/zenoss_core-4.2.4-SP174.zup (zenoss-core-4.2.4)

2013-11-18 19:12:07,940 DEBUG: Calculating local diffs.

2013-11-18 19:17:07,620 DEBUG: Finding modified files.

2013-11-18 19:17:07,631 DEBUG: Found diff for file: Products/ZenUI3/browser/resources/js/zenoss/EventPanels.js

2013-11-18 19:17:08,158 DEBUG: Found diff for file: Products/ZenModel/data/devices.xml

2013-11-18 19:17:08,160 DEBUG: Found diff for file: Products/ZenUtils/zencatalog.py

2013-11-18 19:17:08,177 DEBUG: Found diff for file: Products/Zuul/routers/device.py

2013-11-18 19:17:08,184 DEBUG: Found diff for file: Products/ZenModel/configure.zcml

2013-11-18 19:17:08,192 DEBUG: Found diff for file: Products/ZenEvents/configure.zcml

2013-11-18 19:17:08,195 DEBUG: Found diff for file: Products/Zuul/facades/zepfacade.py

2013-11-18 19:17:08,199 DEBUG: Found diff for file: Products/ZenUI3/browser/resources/js/zenoss/MIBs.js

2013-11-18 19:17:08,205 DEBUG: Found diff for file: Products/ZenUI3/browser/resources/js/zenoss/DeviceDetailBar.js

2013-11-18 19:17:08,224 DEBUG: Found diff for file: Products/ZenEvents/EventClass.py

2013-11-18 19:17:08,235 DEBUG: Found diff for file: Products/Zuul/facades/devicefacade.py

2013-11-18 19:17:08,367 DEBUG: Found diff for file: Products/ZenUI3/browser/resources/js/zenoss/itinfrastructure.js

2013-11-18 19:17:08,368 DEBUG: Found diff for file: Products/ZenModel/migrate/__init__.py

2013-11-18 19:17:08,374 DEBUG: Found diff for file: Products/ZenHub/PBDaemon.py

2013-11-18 19:17:08,384 DEBUG: Found diff for file: Products/ZenModel/Device.py

2013-11-18 19:17:08,387 DEBUG: Found diff for file: Products/ZenEvents/events2/processing.py

2013-11-18 19:17:08,390 DEBUG: Found diff for file: Products/ZenRRD/zencommand.py

2013-11-18 19:17:08,411 DEBUG: Found diff for file: Products/Zuul/routers/zep.py

2013-11-18 19:17:08,418 DEBUG: Found diff for file: Products/ZenModel/MinMaxThreshold.py

2013-11-18 19:17:08,686 DEBUG: Merging local diff (product=zenoss-core-4.2.4, zupfile=/home/zenoss/zenoss_core-4.2.4-SP174.zup)

2013-11-18 19:17:08,704 INFO : Merge Conflicts:

2013-11-18 19:17:08,704 INFO : --- Products/ZenEvents/EventClass.py (pristine)

2013-11-18 19:17:08,704 INFO : +++ Products/ZenEvents/EventClass.py (installed)

2013-11-18 19:17:08,704 INFO : @@ -312,19 +312,6 @@

2013-11-18 19:17:08,704 INFO :          edict._setProperty("zEventAction", "status")

2013-11-18 19:17:08,705 INFO :          edict._setProperty("zEventSeverity", -1, type="int")

2013-11-18 19:17:08,705 INFO :

2013-11-18 19:17:08,705 INFO : -        self._buildEventFlappingZProperties()

2013-11-18 19:17:08,705 INFO : -

2013-11-18 19:17:08,705 INFO : -    def _buildEventFlappingZProperties(self):

2013-11-18 19:17:08,705 INFO : -        edict = self.getDmdRoot("Events")

2013-11-18 19:17:08,705 INFO : -        if getattr(aq_base(edict), "zFlappingThreshold", None) is None:

2013-11-18 19:17:08,705 INFO : -            edict._setProperty("zFlappingThreshold", 4, type="int")

2013-11-18 19:17:08,705 INFO : -

2013-11-18 19:17:08,705 INFO : -        if getattr(aq_base(edict), "zFlappingIntervalSeconds", None) is None:

2013-11-18 19:17:08,705 INFO : -            edict._setProperty("zFlappingIntervalSeconds", 3600, type="int")

2013-11-18 19:17:08,705 INFO : -

2013-11-18 19:17:08,705 INFO : -        if getattr(aq_base(edict), "zFlappingSeverity", None) is None:

2013-11-18 19:17:08,706 INFO : -            edict._setProperty("zFlappingSeverity", 4, type="severity")

2013-11-18 19:17:08,706 INFO : -

2013-11-18 19:17:08,706 INFO :      def testTransformStyle(self):

2013-11-18 19:17:08,706 INFO :          """Test our transform by compiling it.

2013-11-18 19:17:08,706 INFO :          """

2013-11-18 19:17:08,706 INFO : --- Products/ZenEvents/configure.zcml (pristine)

2013-11-18 19:17:08,706 INFO : +++ Products/ZenEvents/configure.zcml (installed)

2013-11-18 19:17:08,706 INFO : @@ -14,10 +14,4 @@

2013-11-18 19:17:08,706 INFO :      <subscriber handler=".zeneventdEvents.onDaemonCreated"/>

2013-11-18 19:17:08,706 INFO :      <subscriber handler=".zeneventdEvents.onDaemonStartRun"/>

2013-11-18 19:17:08,706 INFO :

2013-11-18 19:17:08,706 INFO : -    <adapter

2013-11-18 19:17:08,706 INFO : -        for=".NotificationDao.NotificationDao"

2013-11-18 19:17:08,706 INFO : -        factory=".zenactiond.ProcessSignalTask"

2013-11-18 19:17:08,706 INFO : -        provides=".interfaces.ISignalProcessorTask"

2013-11-18 19:17:08,707 INFO : -        />

2013-11-18 19:17:08,707 INFO : -

2013-11-18 19:17:08,707 INFO :  </configure>

2013-11-18 19:17:08,707 INFO : --- Products/ZenModel/data/devices.xml (pristine)

2013-11-18 19:17:08,707 INFO : +++ Products/ZenModel/data/devices.xml (installed)

2013-11-18 19:17:08,707 INFO : @@ -27,9 +27,6 @@

2013-11-18 19:17:08,707 INFO :  <property visible="True" type="string" id="zSnmpCommunity" >

2013-11-18 19:17:08,707 INFO :  public

2013-11-18 19:17:08,707 INFO :  </property>

2013-11-18 19:17:08,707 INFO : -<property visible="True" type="lines" id="zSnmpDiscoveryPorts" >

2013-11-18 19:17:08,707 INFO : -[]

2013-11-18 19:17:08,707 INFO : -</property>

2013-11-18 19:17:08,707 INFO :  <property visible="True" type="int" id="zSnmpPort" >

2013-11-18 19:17:08,707 INFO :  161

2013-11-18 19:17:08,707 INFO :  </property>

2013-11-18 19:17:08,708 INFO : --- Products/ZenModel/migrate/__init__.py (pristine)

2013-11-18 19:17:08,708 INFO : +++ Products/ZenModel/migrate/__init__.py (installed)

2013-11-18 19:17:08,708 INFO : @@ -250,4 +250,3 @@

2013-11-18 19:17:08,708 INFO :  import fixMysqlPermissions

2013-11-18 19:17:08,708 INFO :  import fixZenrrdcachedConf

2013-11-18 19:17:08,708 INFO :  import ZenossProcessClasszFailSeverity

2013-11-18 19:17:08,708 INFO : -import eventFlapping

2013-11-18 19:17:08,708 INFO : --- Products/ZenRRD/zencommand.py (pristine)

2013-11-18 19:17:08,708 INFO : +++ Products/ZenRRD/zencommand.py (installed)

2013-11-18 19:17:08,708 INFO : @@ -750,9 +750,6 @@

2013-11-18 19:17:08,708 INFO :                  results.events.append(ev)

2013-11-18 19:17:08,708 INFO :

2013-11-18 19:17:08,708 INFO :              else:

2013-11-18 19:17:08,708 INFO : -                # clear our timeout event

2013-11-18 19:17:08,708 INFO : -                msg = "Datasource %s command timed out" % datasource.name

2013-11-18 19:17:08,709 INFO : -                ev = self._makeCmdEvent(datasource, msg, severity=Clear)

2013-11-18 19:17:08,709 INFO :                  # Re-use our results for any similar datasources

2013-11-18 19:17:08,709 INFO :                  cachedDsList = cacheableDS.get(datasource.command)

2013-11-18 19:17:08,709 INFO :                  if cachedDsList:

2013-11-18 19:17:08,709 INFO : --- Products/ZenUtils/zencatalog.py (pristine)

2013-11-18 19:17:08,709 INFO : +++ Products/ZenUtils/zencatalog.py (installed)

2013-11-18 19:17:08,709 INFO : @@ -19,14 +19,12 @@

2013-11-18 19:17:08,709 INFO :  from twisted.internet import defer, reactor, task

2013-11-18 19:17:08,709 INFO :  from OFS.ObjectManager import ObjectManager

2013-11-18 19:17:08,709 INFO :  from ZODB.POSException import ConflictError

2013-11-18 19:17:08,709 INFO : -from ZODB.transact import transact

2013-11-18 19:17:08,709 INFO :  from ZEO.Exceptions import ClientDisconnected

2013-11-18 19:17:08,709 INFO :  from ZEO.zrpc.error import DisconnectedError

2013-11-18 19:17:08,709 INFO :  from zope.component import getUtility

2013-11-18 19:17:08,709 INFO :  from Products.ZenRelations.ToManyContRelationship import ToManyContRelationship

2013-11-18 19:17:08,710 INFO :  from Products.ZenModel.ZenModelRM import ZenModelRM

2013-11-18 19:17:08,710 INFO :  from Products.ZenUtils.ZCmdBase import ZCmdBase

2013-11-18 19:17:08,710 INFO : -from Products.ZenUtils.ZenScriptBase import ZenScriptBase

2013-11-18 19:17:08,710 INFO :  from Products.Zuul.catalog.global_catalog import globalCatalogId, catalog_caching

2013-11-18 19:17:08,710 INFO :  from Products.Zuul.catalog.interfaces import IGlobalCatalogFactory

2013-11-18 19:17:08,710 INFO :

2013-11-18 19:17:08,710 INFO : @@ -130,10 +128,7 @@

2013-11-18 19:17:08,710 INFO :                                 action="store_true",

2013-11-18 19:17:08,710 INFO :                                 default=False,

2013-11-18 19:17:08,710 INFO :                                 help="Only works with --reindex, only update the permissions catalog")

2013-11-18 19:17:08,710 INFO : -        self.parser.add_option("--clean",

2013-11-18 19:17:08,710 INFO : -                               action="store_true",

2013-11-18 19:17:08,710 INFO : -                               default=False,

2013-11-18 19:17:08,710 INFO : -                               help="Cleans up unresolvable paths in the catalog")

2013-11-18 19:17:08,710 INFO : +

2013-11-18 19:17:08,711 INFO :

2013-11-18 19:17:08,711 INFO :      def run(self):

2013-11-18 19:17:08,711 INFO :

2013-11-18 19:17:08,711 INFO : @@ -146,12 +141,10 @@

2013-11-18 19:17:08,711 INFO :                  d = self._createCatalog(zport)

2013-11-18 19:17:08,711 INFO :              elif self.options.reindex:

2013-11-18 19:17:08,711 INFO :                  d = self._reindex(zport)

2013-11-18 19:17:08,711 INFO : -            elif self.options.clean:

2013-11-18 19:17:08,711 INFO : -                d = self._cleanCatalog(zport)

2013-11-18 19:17:08,711 INFO :              d.addBoth(stop)

2013-11-18 19:17:08,711 INFO :

2013-11-18 19:17:08,711 INFO : -        if not self.options.createcatalog and not self.options.reindex and not self.options.clean:

2013-11-18 19:17:08,711 INFO : -            self.parser.error("Must use one of --createcatalog, --reindex, --clean")

2013-11-18 19:17:08,711 INFO : +        if not self.options.createcatalog and not self.options.reindex:

2013-11-18 19:17:08,711 INFO : +            self.parser.error("Must use one of --createcatalog, --reindex")

2013-11-18 19:17:08,712 INFO :          reactor.callWhenRunning(main)

2013-11-18 19:17:08,712 INFO :          with catalog_caching():

2013-11-18 19:17:08,712 INFO :              reactor.run()

2013-11-18 19:17:08,712 INFO : @@ -163,21 +156,6 @@

2013-11-18 19:17:08,712 INFO :              reindex_catalog(globalCat, self.options.permissionsOnly, not self.options.daemon)

2013-11-18 19:17:08,712 INFO :          else:

2013-11-18 19:17:08,712 INFO :              log.warning('Global Catalog does not exist, try --createcatalog option')

2013-11-18 19:17:08,712 INFO : -        return defer.succeed(None)

2013-11-18 19:17:08,712 INFO : -

2013-11-18 19:17:08,712 INFO : -    def _cleanCatalog(self, zport):

2013-11-18 19:17:08,712 INFO : -        global_catalog = self._getCatalog(zport)

2013-11-18 19:17:08,712 INFO : -        uncat = transact(global_catalog.uncatalog_object)

2013-11-18 19:17:08,712 INFO : -

2013-11-18 19:17:08,712 INFO : -        for brain in global_catalog():

2013-11-18 19:17:08,712 INFO : -            try:

2013-11-18 19:17:08,713 INFO : -                obj = brain.getObject()

2013-11-18 19:17:08,713 INFO : -            except Exception:

2013-11-18 19:17:08,713 INFO : -                log.warn("Found unresolvable path, deleting: %s", brain.getPath())

2013-11-18 19:17:08,713 INFO : -                uncat(brain.getPath())

2013-11-18 19:17:08,713 INFO : -

2013-11-18 19:17:08,713 INFO : -        log.info("Finished scanning catalog")

2013-11-18 19:17:08,713 INFO : -

2013-11-18 19:17:08,713 INFO :          return defer.succeed(None)

2013-11-18 19:17:08,713 INFO :

2013-11-18 19:17:08,713 INFO :      def _createCatalog(self, zport):

2013-11-18 19:17:08,713 INFO : --- Products/Zuul/routers/zep.py (pristine)

2013-11-18 19:17:08,713 INFO : +++ Products/Zuul/routers/zep.py (installed)

2013-11-18 19:17:08,713 INFO : @@ -726,14 +725,6 @@

2013-11-18 19:17:08,713 INFO :                  'xtype': 'numberfield',

2013-11-18 19:17:08,713 INFO :                  'allowNegative': False,

2013-11-18 19:17:08,714 INFO :                  'minValue': 1

2013-11-18 19:17:08,714 INFO : -                },{

2013-11-18 19:17:08,714 INFO : -                'id': 'enable_event_flapping_detection',

2013-11-18 19:17:08,714 INFO : -                'name': _t('Enable Event Flapping Detection'),

2013-11-18 19:17:08,714 INFO : -                'xtype': 'checkbox',

2013-11-18 19:17:08,714 INFO : -                }, {

2013-11-18 19:17:08,714 INFO : -                'id': 'flapping_event_class',

2013-11-18 19:17:08,714 INFO : -                'name': _t('Event Flapping Event Class'),

2013-11-18 19:17:08,714 INFO : -                'xtype': 'eventclass'

2013-11-18 19:17:08,714 INFO :                  }]

2013-11-18 19:17:08,714 INFO :          return configSchema

2013-11-18 19:17:08,714 INFO :

2013-11-18 19:17:09,327 ERROR: Error performing install.

2013-11-18 19:17:09,327 ERROR: Conflict(s) merging local diff:

patching file Products/ZenEvents/EventClass.py

Hunk #2 FAILED at 312.

1 out of 2 hunks FAILED -- saving rejects to file zenup log file

patching file Products/ZenEvents/configure.zcml

Reversed (or previously applied) patch detected!  Skipping patch.

1 out of 1 hunk ignored -- saving rejects to file zenup log file

patching file Products/ZenEvents/events2/processing.py

patching file Products/ZenHub/PBDaemon.py

Hunk #2 succeeded at 812 (offset -5 lines).

patching file Products/ZenModel/Device.py

Hunk #1 succeeded at 131 (offset 1 line).

Hunk #2 succeeded at 253 (offset 2 lines).

Hunk #3 succeeded at 276 (offset 2 lines).

patching file Products/ZenModel/MinMaxThreshold.py

Hunk #5 succeeded at 217 (offset -1 lines).

patching file Products/ZenModel/configure.zcml

patching file Products/ZenModel/data/devices.xml

Reversed (or previously applied) patch detected!  Skipping patch.

1 out of 1 hunk ignored -- saving rejects to file zenup log file

patching file Products/ZenModel/migrate/__init__.py

Hunk #1 FAILED at 250.

1 out of 1 hunk FAILED -- saving rejects to file zenup log file

patching file Products/ZenRRD/zencommand.py

Hunk #1 FAILED at 750.

1 out of 2 hunks FAILED -- saving rejects to file zenup log file

patching file Products/ZenUI3/browser/resources/js/zenoss/DeviceDetailBar.js

patching file Products/ZenUI3/browser/resources/js/zenoss/EventPanels.js

Hunk #1 succeeded at 610 (offset 35 lines).

Hunk #2 succeeded at 749 (offset 35 lines).

Hunk #3 succeeded at 1314 (offset 50 lines).

patching file Products/ZenUI3/browser/resources/js/zenoss/MIBs.js

patching file Products/ZenUI3/browser/resources/js/zenoss/itinfrastructure.js

Hunk #4 succeeded at 1264 (offset 3 lines).

Hunk #5 succeeded at 1457 (offset 3 lines).

Hunk #6 succeeded at 1653 (offset 3 lines).

patching file Products/ZenUtils/zencatalog.py

Hunk #1 FAILED at 19.

Hunk #2 FAILED at 130.

Hunk #3 FAILED at 146.

Hunk #4 FAILED at 163.

4 out of 4 hunks FAILED -- saving rejects to file zenup log file

patching file Products/Zuul/facades/devicefacade.py

patching file Products/Zuul/facades/zepfacade.py

Hunk #2 succeeded at 779 with fuzz 2.

patching file Products/Zuul/routers/device.py

patching file Products/Zuul/routers/zep.py

Hunk #2 succeeded at 35 (offset 1 line).

Hunk #3 FAILED at 726.

Hunk #4 succeeded at 848 (offset 23 lines).

1 out of 4 hunks FAILED -- saving rejects to file zenup log file


Viewing all articles
Browse latest Browse all 1118

Trending Articles