Github user redsanket commented on a diff in the pull request: https://github.com/apache/storm/pull/845#discussion_r43956807 --- Diff: storm-core/src/clj/backtype/storm/daemon/nimbus.clj --- @@ -346,53 +400,104 @@ [(.getNodeId slot) (.getPort slot)] ))) +(defn- get-metadata-version [blob-store key subject] + (let [blob-meta (.getBlobMeta blob-store key subject)] + (.get_version blob-meta))) + +(defn get-key-set-from-blob-store [blob-store] + (let [key-iter (.listKeys blob-store get-nimbus-subject)] + (set (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-metadata-version blob-store jar-key subject))))) + (.createBlob blob-store conf-key (Utils/toCompressedJsonConf storm-conf) (SettableBlobMeta. BlobStoreAclHandler/DEFAULT) subject) + (if (instance? LocalFsBlobStore blob-store) + (.setup-blobstore! storm-cluster-state conf-key nimbus-host-port-info (get-metadata-version blob-store conf-key subject))) + (.createBlob blob-store code-key (Utils/serialize topology) (SettableBlobMeta. BlobStoreAclHandler/DEFAULT) subject) + (if (instance? LocalFsBlobStore blob-store) + (.setup-blobstore! storm-cluster-state code-key nimbus-host-port-info (get-metadata-version blob-store code-key subject))))) + +(defn- read-storm-topology [storm-id blob-store] + (Utils/deserialize + (.readBlob blob-store (master-stormcode-key storm-id) (get-subject)) StormTopology)) + +(defn- get-blob-replication-count [blob-key nimbus] + (if (:blob-store nimbus) + (-> (:blob-store nimbus) + (.getBlobReplication blob-key get-nimbus-subject) + (.get_replication)))) (defn- wait-for-desired-code-replication [nimbus conf storm-id] (let [min-replication-count (conf TOPOLOGY-MIN-REPLICATION-COUNT) max-replication-wait-time (conf TOPOLOGY-MAX-REPLICATION-WAIT-TIME-SEC) - total-wait-time (atom 0) - current-replication-count (atom (if (:code-distributor nimbus) (.getReplicationCount (:code-distributor nimbus) storm-id) 0))] - (if (:code-distributor nimbus) - (while (and (> min-replication-count @current-replication-count) - (or (= -1 max-replication-wait-time) - (< @total-wait-time max-replication-wait-time))) + current-replication-count-jar (if (not (local-mode? conf)) (atom + (get-blob-replication-count (master-stormjar-key storm-id) nimbus)) + (atom min-replication-count)) + current-replication-count-code (atom (get-blob-replication-count (master-stormcode-key storm-id) nimbus)) + current-replication-count-conf (atom (get-blob-replication-count (master-stormconf-key storm-id) nimbus)) + total-wait-time (atom 0)] + (log-message "wait for desired replication" "count" + min-replication-count "wait-time" max-replication-wait-time + "code" @current-replication-count-code + "conf" @current-replication-count-conf + "jar" @current-replication-count-jar + "replication count" (get-blob-replication-count (master-stormconf-key storm-id) nimbus)) + (if (:blob-store nimbus) + (while (and (> min-replication-count @current-replication-count-jar) + (> min-replication-count @current-replication-count-code) + (> min-replication-count @current-replication-count-conf) + (or (= -1 max-replication-wait-time) + (< @total-wait-time max-replication-wait-time))) (sleep-secs 1) (log-debug "waiting for desired replication to be achieved. min-replication-count = " min-replication-count " max-replication-wait-time = " max-replication-wait-time - "current-replication-count = " @current-replication-count " total-wait-time " @total-wait-time) + (if (not (local-mode? conf))"current-replication-count for jar key = " @current-replication-count-jar) + "current-replication-count for code key = " @current-replication-count-code + "current-replication-count for conf key = " @current-replication-count-conf + " total-wait-time " @total-wait-time) (swap! total-wait-time inc) - (reset! current-replication-count (.getReplicationCount (:code-distributor nimbus) storm-id)))) - (if (< min-replication-count @current-replication-count) - (log-message "desired replication count " min-replication-count " achieved, - current-replication-count" @current-replication-count) - (log-message "desired replication count of " min-replication-count " not achieved but we have hit the max wait time " - max-replication-wait-time " so moving on with replication count = " @current-replication-count) - ))) - -(defn- read-storm-topology [conf storm-id] - (let [stormroot (master-stormdist-root conf storm-id)] - (Utils/deserialize - (FileUtils/readFileToByteArray - (File. (master-stormcode-path stormroot)) - ) StormTopology))) + (if (not (local-mode? conf))(reset! current-replication-count-conf (get-blob-replication-count (master-stormconf-key storm-id)))) + (reset! current-replication-count-code (get-blob-replication-count (master-stormcode-key storm-id))) + (reset! current-replication-count-jar (get-blob-replication-count (master-stormjar-key storm-id))))) --- End diff -- i am passing in two arguments, will try to make the indentation clear
--- 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. ---