Github user d2r commented on a diff in the pull request: https://github.com/apache/storm/pull/845#discussion_r44985482 --- Diff: storm-core/src/clj/backtype/storm/daemon/nimbus.clj --- @@ -390,53 +444,99 @@ [(.getNodeId slot) (.getPort slot)] ))) +(defn- get-version-for-key [key nimbus-host-port-info conf] + (let [version (KeyVersion. key nimbus-host-port-info)] + (.getKey version conf))) + +(defn get-key-seq-from-blob-store [blob-store] + (let [key-iter (.listKeys blob-store nimbus-subject)] + (iterator-seq key-iter))) + (defn- setup-storm-code [nimbus conf storm-id tmp-jar-location storm-conf topology] - (let [stormroot (master-stormdist-root conf storm-id)] - (log-message "nimbus file location:" stormroot) - (FileUtils/forceMkdir (File. stormroot)) - (FileUtils/cleanDirectory (File. stormroot)) - (setup-jar conf tmp-jar-location stormroot) - (FileUtils/writeByteArrayToFile (File. (master-stormcode-path stormroot)) (Utils/serialize topology)) - (FileUtils/writeByteArrayToFile (File. (master-stormconf-path stormroot)) (Utils/toCompressedJsonConf storm-conf)) - (if (:code-distributor nimbus) (.upload (:code-distributor nimbus) stormroot storm-id)) - )) + (let [subject (get-subject) + storm-cluster-state (:storm-cluster-state nimbus) + blob-store (:blob-store nimbus) + jar-key (master-stormjar-key storm-id) + code-key (master-stormcode-key storm-id) + conf-key (master-stormconf-key storm-id) + nimbus-host-port-info (:nimbus-host-port-info nimbus)] + (if tmp-jar-location ;;in local mode there is no jar + (do + (.createBlob blob-store jar-key (FileInputStream. tmp-jar-location) (SettableBlobMeta. BlobStoreAclHandler/DEFAULT) subject) + (if (instance? LocalFsBlobStore blob-store) + (.setup-blobstore! storm-cluster-state jar-key nimbus-host-port-info (get-version-for-key jar-key nimbus-host-port-info conf))))) --- End diff -- Can use `when` instead of `if ... do` here.
--- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---