Commit Graph
222 Commits
Author SHA1 Message Date
gojomo c7ed3e775d Misc
* ArchiveUtils.java
   (checkContinue) utility method relocated from ToeThread for converting interrupt status to exception
* ClassKeyMatchesRegExpDecideRule.java
   properly set up crawlController property for auto-wiring
2009-10-05 22:59:46 +00:00
gojomo 16538f175c Cleanup, refactoring
* (many)
   update license notice to Apache where appropriate
   eliminate ProcessorURI, DefaultProcessorURI in favor of CrawlURI (now in modules package)
   other comment/warning/unused code cleanup
2009-10-05 22:49:19 +00:00
gojomo c04c5dbdbc Improve test robustness
* Engine.java
    wait another second before testing for job wrap-up
2009-10-05 22:25:44 +00:00
szznax 62690268b7 Initial checkin for [HER-1641] migration tool to convert Heritrix 1.14.x order.xml to H3 crawler-beans.cxml 2009-10-05 20:00:56 +00:00
gojomo c05044d51b Eliminate double-database close log messages
* BdbModule.java
   split openDatabase() to openManagedDatabase() (auto-closed) and plain openDatabase() (caller-closes)
   set TempStoredSortedMap to use unmanaged openDatabase
* (others)
   use openManagedDatabase()
2009-10-04 05:06:14 +00:00
gojomo 3cb6b59b8c [HER-769] Support case where millions of seeds.
* BdbModule.java
    add temp-stored-map service method
    remove unused secondary-db support
* TempStoredSortedMap.java
    StoredSortedMap that can destroy its underlying database after temporary use
* StatisticsTracker.java
    update various sorted-by-decreasing-frequency methods to use temp StoredMaps, with duplicate keys that are negative counts
* (Multiple)Report.java
    update to use new duplicate-keyed frequency maps
2009-10-03 23:28:11 +00:00
gojomo 99020c4981 [HER-1672] parallelQueues with overlays - prerequisites not landing in right queues (causes massive DNS-fetch repeats)
* PreconditionEnforcer.java, CrawlServer.java
    in testing found some ordering issues affecting robots-scheduling if parallelQueues>1
    reordered/refactored to put more responsibility in CrawlServer to resolve
2009-09-29 00:47:38 +00:00
gojomo 1c1a6501ba [HER-1672] parallelQueues with overlays - prerequisites not landing in right queues (causes massive DNS-fetch repeats)
* CrawlURI.java
    (getPolicyBasisUURI) return either own UURI, or -- for prereqs -- via UURI, as basis for overlays/policy calculations
* URIAuthorityBasedQueueAssignmentPolicy.java
    use getPolicyBasisUURI for queue-name decisions
* SheetOverlaysManager.java
    use getPolicyBasisUURI for surt-based overlay decisions
2009-09-26 04:18:25 +00:00
gojomo 71aa2ad51d * StatisticsTracker.java, HostsReport.java
rename getReverseSortedHostsDistribution() so it isn't misinterpreted as beans property
2009-09-26 04:09:20 +00:00
gojomo e7ab73dd5d [HER-1677] threads stuck in CachedBdbMap.get/_getMem
alternate simplified implementation of our object-cache need
* ObjectIdentityCache.java
    new interface, far less than (Concurrent)Map, for big seems-like-in-memory object-cache
* Supplier.java
    trivial interface for deferred-provision of new instance
* CachedBdbMap.java
    implement ObjectIdentityCache, mainly via getOrUse()
* ObjectIdentityMemCache.java
    trivial ConcurrentHashMap-based all-in-memory ObjectIdentityCache implementation
* ObjectIdentityBdbCache.java
    BDB-backed ObjectIdentityCache implementation, carved from CachedBdbMap
* BdbModule.java
    refactor utility methods to offer CachedBdbMap or ObjectIdentityBdbCache instances, via source toggle
* EnhancedEnvironment.java
    convenience test-environment method
* (others)
    update to use ObjectIdentityCache/ObjectIdentityMemCache in place of ConcurrentMap/ConcurrentHashMap
2009-09-25 21:16:53 +00:00
gojomo 163dcb7826 [HER-1607] handle persist state when crawl starts up
* BdbModule.java
    fail-fast if not started properly; stop with fewer errors in problem situations
* CrawlController.java
    continue past runtimeException on stop
* CrawlJob.java
    less redundant error-reporting
* AbstractFrontier.java
    consider PAUSE or FINISH valid targets after unexpected exception 
* StatisticsTracker.java
    avoid promoting runtimeException in report-generating up
* PersistOnlineProcessor.java
    delegate DB-closing to BdbModule to avoid double-close
2009-09-11 02:26:04 +00:00
gojomo d5e088ed6a * WorkQueueFrontier.java
improve frontier report: move longest-queue to top, add labels/counters to long lists of queue groups
2009-09-10 22:40:30 +00:00
gojomo 1c451021d1 * PagedRepresentation.java
make 'end' link go to true end, not end-as-of-moment-of-rendering
2009-09-10 21:57:21 +00:00
gojomo 1e3ec9fe35 * SheetAssociation.java
initialize list of names for easier in-crawl construction/insertion
2009-09-10 21:56:44 +00:00
gojomo 0b10862c8d Make during-crawl sheets/overlay changes easier
* SheetOverlaysManager.java
    convenience methods for during-crawl changes:
    (getOrCreateSheet)
    (deleteSheet)
    (putSheetOverlay)
    (removeSheetOverlay)
* Sheet.java
    improved comments
2009-09-03 06:33:25 +00:00
gojomo c88744ab27 Improve bean-browse UI
* BeanBrowseResource.java
    coerce edits to type of value they're replacing; makes for safer mid-crawl edits of values in maps
* JobRelatedResource.java
    improve rendering/clickability of map, indexed objects
2009-09-03 03:32:07 +00:00
gojomo f26803bd4f UI tweaks
* JobResource.java
    make jaob main page begin with job title -- easier to distinguish tabs with different jobs in them
2009-09-03 03:27:05 +00:00
gojomo 635d27b390 More action directory capabilities
* ActionDirectory.java
    execute scripts found in action directory, determining language by their suffix
2009-09-03 03:15:54 +00:00
gojomo 21d90f2a3a UI annoyances
* ReportGenResource.java
    ensure redirect after regeneration of report doesn't show stale cached version
2009-09-02 23:15:18 +00:00
gojomo d4eabb9631 Improve log display
* JobResource.java
    form proper alerts-rev-tail link
    for any file ending ".log", use rev-tail-paged view
2009-09-01 22:42:52 +00:00
gojomo f0421e1f13 * ActionDirectory.java
also include 'Fi ' lines -- for recoveries of recoveries
2009-08-28 17:08:59 +00:00
gojomo 211cd7c659 [HER-1669] slow crawl/contention n WARCWriterProcessor
* CrawlController.java
    increase default size of in-memory recording buffers 
    outBuffer (requests): 4K -> 16K
    inBuffer (responses): 64K -> 512K
2009-08-27 23:13:11 +00:00
gojomo 3f9ecc4dfa * PagedRepresentation.java
fix negative estimated size error for log-tail viewing
2009-08-27 00:10:48 +00:00
gojomo d654bb5651 [HER-1660] allow adding seeds, recovery-journal-like URI data at any point in crawl via 'action directory'
* ActionDirectory.java
     support for .seeds, .recover, .include, .schedule, .force files
* CrawlController.java
    change default for pause-at-start to true; ensure enters PAUSED rather than PAUSING
* Frontier.java 
    (importRecoverFormat) support method for .recover, .include, .schedule, .force additions
    (considerIncluded) change to accept CrawlURI
* AbstractFrontier.java
    (importRecoverFormat) support method for .recover, .include, .schedule, .force additions
* BdbFrontier.java
    remove too-strict assertion
* FrontierJournal.java
    rename recover-log 'frontier.recover.gz' (so that '.recover' is a dot-suffix)
* WorkQueueFrontier.java
    (considerIncluded) change to accept CrawlURI
2009-08-12 01:50:51 +00:00
gojomo bba028ce21 * StatisticsTracker.java, SeedsReport.java
remove redundant method
2009-08-12 01:35:19 +00:00
gojomo a37a1846b7 Move getBufferedReader() -> IoUtils
* CrawlerJournal.java, IoUtils.java
    move getBufferedReader to IoUtils
* FrontierJournal.java
    add new 'included' tag for log lines ("Fi")
* (others)
    update for relocated method
2009-08-11 02:17:20 +00:00
gojomo 023efe4aba [HER-1660] allow adding seeds, recovery-journal-like URI data at any point in crawl via 'action directory'
* ActionDirectory.java
    initial implementation; handle '.seeds' files
2009-08-06 21:33:31 +00:00
gojomo 0400d81ee5 support for...
[HER-1660] allow adding seeds, recovery-journal-like URI data at any point in crawl via 'action directory' 
[HER-769] Support case where millions of seeds. 
* AbstractFrontier.java
    move sourceTagSeeds setting to SeedModule
    trigger and schedule seeds via SeedModule's announcements and SeedListener protocols
* StatisticsTracker.java
    implement SeedListener, use processedSeedRecords as list of all seeds
* ProcessorURI.java, DefaultProcessorURI.java
    (getURI) convenience accessor for plain URI string
* SurtPrefixedDecideRule.java
    use seeds as prefixes via SeedListener notifications, rather than separate scan of seeds source text
* SeedListener.java
    simplify to notifications of new seed, and nonseed text mixed with seeds (as with SURT directives)
* SeedModule.java
    methods for SeedListener interface, announceSeeds, actOn(File)
* TextSeedModule.java
    eliminate interators; add methods for announcing seeds and scanning seed text sources (including arbitrary Files)
* PrefixSet.java, SurtPrefixSet.java
    derive from ConcurrentSkipListSet; eliminate now-unneeded extra synchronization and clone()s 
    offer considerAsDirective() for direct application of directive Strings
2009-08-06 21:24:04 +00:00
gojomo 4d06b239ee Push CrawlURI and related constants down to modules subproject/package
(many)
2009-08-06 20:22:00 +00:00
gojomo 4f0961c371 Fix NPE
* URIAuthorityBasedQueueAssignmentPolicy.java
    tolerate null getRawPathQuery response
2009-08-04 01:31:38 +00:00
gojomo c196a1de77 [HER-1658] CachedBdbMaps not expunging as expected (especially StatisticsTracker.processedSeedsRecords)
* CachedBdbMap.java
    do expunge on put(), replace()
    add low-memory-sensitive 'canary' to force expunge even if otherwise untriggered
* CachedBdbMapTest.java
    add test of idle expunge in low-memory conditions
* CrawlURI.java
    (getURI) direct access to String URI (don't reuse toString() functionally)
* SeedRecord.java
    support for updating record with later/repeat report
* StatisticsTracker.java
    remove put()s for processedSeedRecords, hostsLastFinished
* BdbFrontier.java
    (getQueueFor) remove put, do in concurrent-compliant manner
2009-08-04 00:06:22 +00:00
gojomo 5bb8596fab Work for [HER-1656] add multiple-queues-per-host ('parallelQueues') capabilities to QueueAssignmentPolicies
* LongToIntConsistentHash.java + Test
    consistent-hashing utility class
* URIAuthorityBasedQueueAssignmentPolicy.java
    shared superclass for the hostname and surtauthority QAPs
    setting for 'deferToPrevious' -- avoid changing assignments
    setting for 'parallelQueues' -- when > 1, consistent-hash URIs across that many separate queues (with numerical suffix)
* SurtAuthorityQueueAssignmentPolicy.java, HostnameQueueAssignmentPolicy.java
    refactor to derive from URIAuthorityBasedQueueAssignmentPolicy
* QueueAssignmentPolicy.java
    add Apache license
* Hop.java
    add String representation for convenience
2009-07-28 23:02:11 +00:00
gojomo d2a82228a3 TODO/FIXME comments where things don't seem quite right but aren't definitively buggy
* CachedBdbMap.java
    reevaluate if clear() should include close()
* CrawlURI.java
    investigate possible confusion in meaning of isPrerequisite()
2009-07-28 22:56:54 +00:00
gojomo 5027fb9aa0 * AbstractFrontier.java, WrokQueueFrontier.java
remove outdated comments; use isEmpty()
2009-07-28 22:47:01 +00:00
gojomo 917dfc2bd3 Fix ConfigPath inconsistencies in reporting, relative paths, fixup-ordering
* ConfigPathConfigurer.java
    work in two passes: one (BeanPostProcessor) collects all candidates for fixup, two (ApplicationListener) actually performs fixup
    suppress fixup of own base path, preventing circulare ref/StackOverflow
* ConfigPath.java
    change sense of 'merge' to merge into receiver
* SurtPrefixedDecideRule.java
    use ConfigFile, use 'merge' in assignment
* CrawlerLoggerModule.java
    use merge in assignment
* CrawlJob.java
    (getBeanpathTarget) utility method
* JobResource.java
    respect unset ConfigPaths
* ConfigPathEdito.java, ConfigFileEditor.java
    better comments, ConfigFile variant
2009-07-24 20:22:06 +00:00
gojomo 60ebd6cfdb * CrawlController.java
better handle case where crawl is discarded before launched
2009-07-24 00:27:57 +00:00
gojomo c3cc7cc7e5 * JobResource.java
complete rename of printLinked to printLinkedFile
2009-07-24 00:27:27 +00:00
gojomo 0b577387af improve display of known ConfigPaths
* ConfigPathConfigurer.java
    key by propPath
* JobResource.java
    display by "propPath: assigned name"
* WriterPoolProcessor.java
    fix typo
2009-07-24 00:06:34 +00:00
gojomo 3d573a8d5f Resolve remaining broken links to logs outside job dir
* JobResource.java
    refactor, improve printLinkedFile
* EngineApplication.java
    remove debug output
2009-07-24 00:00:28 +00:00
gojomo ace6d95ab8 Fix race conditions/unclean shutdown around 'teardown' (esp. if crawl running)
* CrawlController.java
   (isFinished) added
* CrawlJob.java 
   rename reset to teardown
   wait for CrawlController to report finished before discarding AppContext
   if not finished in time, fail reporting 'false'
* JobResource.java
   show Flash if teardown did not succeed; user must retry
* BdbUriUniqFilter.java
   don't throw DatabaseException from simple accessor
2009-07-23 22:49:42 +00:00
gojomo e0d748cd3b improve comment 2009-07-23 20:28:29 +00:00
gojomo 52a0895c6b * JobResource.java
rename 'discard' to 'teardown'
    enable browse/edit of paths outside jobdir via new /anypath/ service
* EngineResource.java, Engine.java
    enable addition of job dirs from outside main jobs directory
* EngineApplication.java
    register new /engine/anypath service for outside-job-dir paths
2009-07-22 15:59:30 +00:00
gojomo 4d7c4834d8 * ScriptResource.java
offer better ack of lines-executed (even if they generate no output)
2009-07-22 15:53:49 +00:00
gojomo d6496b993a * SheetOverlaysManager.java
make empty map modifiable, to ease during-crawl additions
    add accessors for other fields, to ease browsing
2009-07-20 20:09:08 +00:00
gojomo 427b633826 Large seed list = web UI launch spins for hours without returning
* CrawlJob.java
    move the requestCrawlStart into the background/crawl-group thread
2009-07-14 23:56:53 +00:00
gojomo dd254088e1 [HER-1633] port IsCrossTopmostAssignedSurtHopDecideRule to heritrix3
* HopCrossesAssignmentLevelDomainDecideRule.java
    port H2 IsCrossTopmostAssignedSurtHopDecideRule to H3 under this new name
* PublicSuffixes.java
    update comment, public method for 'Assignment Level Domain'/'Assignment Level SURT' term
* AssignmentLevelSurtQueueAssignmentPolicy
    renamed TopmostAssignedSurtQueueAssignmentPolicy
2009-07-08 00:28:56 +00:00
gojomo 89a55c7fdd * JobResource.java
make UI more robust against browser/platform font size variances
2009-07-06 23:37:30 +00:00
gojomo 149fc414df [HER-1609] wide crawl performance is limited by lock contention in ServerCache.getServerFor(String)
* (all, especially CachedBdbMap.java) 
    pbaclace-contributed patch, ported to H3, plus...
* StatisticsTracker.java
    replace LongWrapper with AtomicLong
    use non-recursive putIfAbsent-based idiom for get-or-create
* DefaultServerCache.java
    clean up host/server get-or-create around non-recursive concurrent idiom
* BdbModule.java
    add expectedConcurrency property & je.lock.nLockTables tuning
* TopNSet.java
    add synchronization, as calling StatisticsTracker method has lost it
2009-07-06 23:36:17 +00:00
gojomo 4583ff7306 Rename Rrc2617Credential to HttpAuthenticationCredential
* (multiple)
    use more-familiar name for HTTP authentication
2009-07-06 22:09:52 +00:00
gojomo ecd93ae458 Fixes from trial guide testing
* Heritrix.java
    fail-fast with helpful error message if launched with Java < 1.6
* EditRepresentation.java
    "save changes" rather than "update content"
* EngineApplication.java
    customize restlet error to include back-button and full stack (instead of link to HTTP spec!)
2009-06-10 22:31:44 +00:00