Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge changes from nathanmarz/storm master #15

Merged
merged 62 commits into from
Jul 31, 2013
Merged

Conversation

anfeng
Copy link
Owner

@anfeng anfeng commented Jul 31, 2013

No description provided.

Yu L Li and others added 30 commits April 23, 2013 18:33
…11 (Latest Release)

Storm is using a snakeyaml version that is now two revisions old. I have recently come across a dependency conflict when using Storm with JRuby 1.7.3. When running in ruby 1.9 mode JRuby utilizes the snakeyaml library, however the internal JRuby  version of snakeyaml 1.11. Since Storm is running an outdated version, it would make sense to propose the change in hopes of resolving this dependency conflict.
Enable java HashMap used for ZMQ messaging configuration
Details:
* For every Config there is a schema of type Object named with the
  _SCHEMA suffix (e.g., TOPOLOGY_WORKERS_SCHEMA)
* For simple Classes (String, Number, Boolean), just the Class is
  sufficient for the schema's value
* For other Classes, instances of the FieldValidator interface are used.
* FieldValidator declares a method to validate the field and a method to
  return a plain-language description of the criteria for the user.

Status: Compiles, but not tested.  Nothing makes use of the schemas yet.
merge changes from nathanmarz/storm master
1. viewing log file
2. get/set log4j log level online
Fix for port allocation errors during tests
Launch workers with id and port properties
nathanmarz and others added 28 commits July 9, 2013 11:47
Update project.clj - Bump snakeyaml dependency version from 1.9 to 1.11 (Latest Release)
Other cosmetic changes.
Conflicts:
	conf/defaults.yaml
	storm-core/src/jvm/backtype/storm/Config.java
make FixedBatchSpout batch aware.
…eptions

Includes key in invalid config exception message
The topology.metrics.consumer.register is a list of hashes, but its schema was StringsValidator. Added a 'MapsValidator' (list of Map) and fixed the schema.
* Added a LoggingMetricsConsumer example of a MetricsConsumer. Use it by adding 'conf.registerMetricsConsumer(LoggingMetricsConsumer.class);' when you construct your topology.
* Added a dedicated appender to the example logback/cluster.xml called METRICS.
  Its log format omits the class and priority since with the dedicated appender those are redu
Specify jvm_opts when calling storm jar
Throw Exception if OpaqueValue's txId is ahead of batchTxId
LoggingMetricsConsumer, to dump metrics to log file
fix topology.metrics.consumer.register validation: Map, not String
anfeng added a commit that referenced this pull request Jul 31, 2013
merge changes from nathanmarz/storm master
@anfeng anfeng merged commit 4dca40c into anfeng:master Jul 31, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants